pyrox.dev
lol
vagrant: cleanup FIX plugin install from #17614 (#17663)
authored by
Kamil Chmielewski
and committed by
Robin Gloster
532b2222
3e6c2a55
+5
-6
+5
-6
pkgs/development/tools/vagrant/default.nix
+5
-6
pkgs/development/tools/vagrant/default.nix
···
1
1
{ stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconv
2
-
, libxml2, libxslt, coreutils, makeWrapper }:
2
+
, libxml2, libxslt, makeWrapper }:
3
3
4
4
assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
5
5
···
77
77
ln -s ${ruby}/bin/ri opt/vagrant/embedded/bin
78
78
ln -s ${ruby}/bin/ruby opt/vagrant/embedded/bin
79
79
80
+
# ruby libs
81
+
rm -rf opt/vagrant/embedded/lib
82
+
ln -s ${ruby}/lib opt/vagrant/embedded/lib
83
+
80
84
# libiconv: iconv
81
85
rm opt/vagrant/embedded/bin/iconv
82
86
ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin
···
96
100
cp -r opt "$out"
97
101
cp -r usr/bin "$out"
98
102
wrapProgram "$out/bin/vagrant" --prefix LD_LIBRARY_PATH : "$out/opt/vagrant/embedded/lib"
99
-
100
-
substituteInPlace $out/opt/vagrant/embedded/lib/ruby/2.2.0/x86_64-linux/rbconfig.rb \
101
-
--replace '"/bin/mkdir' '"${coreutils}/bin/mkdir'
102
-
substituteInPlace $out/opt/vagrant/embedded/lib/ruby/2.2.0/x86_64-linux/rbconfig.rb \
103
-
--replace "'/usr/bin/install" "'${coreutils}/bin/install"
104
103
'';
105
104
106
105
preFixup = ''