diff options
| author | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-08-12 11:33:37 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-08-12 09:33:37 +0000 |
| commit | 532b2222965377e77ed884c463ee2751fb51dba3 (patch) | |
| tree | 786b406638e6973a498daf52db33abb56d3564dd /pkgs/development/tools/vagrant | |
| parent | 3e6c2a55a7e85b1a5117327924cc3d847610ab1a (diff) | |
vagrant: cleanup FIX plugin install from #17614 (#17663)
Diffstat (limited to 'pkgs/development/tools/vagrant')
| -rw-r--r-- | pkgs/development/tools/vagrant/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index e843872713569..242782161d75c 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -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 = '' |