BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #17614 from kamilchm/vagrant-plugin-fix

Browse source 
vagrant: FIX #16837 vagrant plugin install
This commit is contained in:
Robin Gloster 2016-08-09 15:27:39 +00:00 committed by GitHub
commit 19f398870a
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/tools/vagrant/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconv
, libxml2, libxslt, makeWrapper }:
, libxml2, libxslt, coreutils, makeWrapper }:
assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
@ -96,6 +96,11 @@ stdenv.mkDerivation rec {
cp -r opt "$out"
cp -r usr/bin "$out"
wrapProgram "$out/bin/vagrant" --prefix LD_LIBRARY_PATH : "$out/opt/vagrant/embedded/lib"
substituteInPlace $out/opt/vagrant/embedded/lib/ruby/2.2.0/x86_64-linux/rbconfig.rb \
--replace '"/bin/mkdir' '"${coreutils}/bin/mkdir'
substituteInPlace $out/opt/vagrant/embedded/lib/ruby/2.2.0/x86_64-linux/rbconfig.rb \
--replace "'/usr/bin/install" "'${coreutils}/bin/install"
'';
preFixup = ''