diff options
| author | Robin Gloster <mail@glob.in> | 2016-08-09 15:27:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-09 15:27:39 +0000 |
| commit | 19f398870a0fa022548b047e50cd443e85b5622d (patch) | |
| tree | cc94514a9b11893693fa580c885198a1bc85aa17 | |
| parent | b0b0a45bb1277e77528a0216a0f697540ef659a6 (diff) | |
| parent | 5d5b2d3f8f341c31a5da2ada182f8a2a9bb9935c (diff) | |
| download | nixlib-19f398870a0fa022548b047e50cd443e85b5622d.tar nixlib-19f398870a0fa022548b047e50cd443e85b5622d.tar.gz nixlib-19f398870a0fa022548b047e50cd443e85b5622d.tar.bz2 nixlib-19f398870a0fa022548b047e50cd443e85b5622d.tar.lz nixlib-19f398870a0fa022548b047e50cd443e85b5622d.tar.xz nixlib-19f398870a0fa022548b047e50cd443e85b5622d.tar.zst nixlib-19f398870a0fa022548b047e50cd443e85b5622d.zip | |
Merge pull request #17614 from kamilchm/vagrant-plugin-fix
vagrant: FIX #16837 vagrant plugin install
| -rw-r--r-- | pkgs/development/tools/vagrant/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index ae1dbe4462cf..e84387271356 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, 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 = '' |