JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vagrant: cleanup FIX plugin install from #17614 (#17663)

Browse Source
This commit is contained in:
Kamil Chmielewski 2016-08-12 11:33:37 +02:00 committed by Robin Gloster
parent 3e6c2a55a7
commit 532b222296
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/tools/vagrant/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconv
, libxml2, libxslt, coreutils, makeWrapper }:
, libxml2, libxslt, makeWrapper }:
assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
@ -77,6 +77,10 @@ stdenv.mkDerivation rec {
ln -s ${ruby}/bin/ri opt/vagrant/embedded/bin
ln -s ${ruby}/bin/ruby opt/vagrant/embedded/bin
# ruby libs
rm -rf opt/vagrant/embedded/lib
ln -s ${ruby}/lib opt/vagrant/embedded/lib
# libiconv: iconv
rm opt/vagrant/embedded/bin/iconv
ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin
@ -96,11 +100,6 @@ 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 = ''