diff options
| author | Diego Zamboni <diego@zzamboni.org> | 2017-10-04 21:50:21 +0200 |
|---|---|---|
| committer | Diego Zamboni <diego@zzamboni.org> | 2017-10-04 22:06:39 +0200 |
| commit | 97d9f0b5bba3251f5287037dc31e9c5aaae9cd61 (patch) | |
| tree | b9bce47484fce49dd5a36c091315e33ea906e519 /pkgs/development/tools/vagrant/default.nix | |
| parent | dea58ce228e6f9686773745024eb844d8dc39fc3 (diff) | |
| download | nixpkgs-97d9f0b5bba3251f5287037dc31e9c5aaae9cd61.tar nixpkgs-97d9f0b5bba3251f5287037dc31e9c5aaae9cd61.tar.gz nixpkgs-97d9f0b5bba3251f5287037dc31e9c5aaae9cd61.tar.bz2 nixpkgs-97d9f0b5bba3251f5287037dc31e9c5aaae9cd61.tar.lz nixpkgs-97d9f0b5bba3251f5287037dc31e9c5aaae9cd61.tar.xz nixpkgs-97d9f0b5bba3251f5287037dc31e9c5aaae9cd61.tar.zst nixpkgs-97d9f0b5bba3251f5287037dc31e9c5aaae9cd61.zip | |
vagrant: fix Ruby and libffi libraries on Darwin
On Darwin, keep the Ruby and libffi libraries and binaries bundled with Vagrant instead of linking to the Nix ones, to avoid errors about libraries not found.
Diffstat (limited to 'pkgs/development/tools/vagrant/default.nix')
| -rw-r--r-- | pkgs/development/tools/vagrant/default.nix | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 91c0054fe91..c61d521ecab 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -85,6 +85,22 @@ in stdenv.mkDerivation rec { ln -s ${openssl.bin}/bin/c_rehash opt/vagrant/embedded/bin ln -s ${openssl.bin}/bin/openssl opt/vagrant/embedded/bin + # libiconv: iconv + rm opt/vagrant/embedded/bin/iconv + ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin + + # libxml: xml2-config, xmlcatalog, xmllint + rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint} + ln -s ${libxml2.dev}/bin/xml2-config opt/vagrant/embedded/bin + ln -s ${libxml2.bin}/bin/xmlcatalog opt/vagrant/embedded/bin + ln -s ${libxml2.bin}/bin/xmllint opt/vagrant/embedded/bin + + # libxslt: xslt-config, xsltproc + rm opt/vagrant/embedded/bin/{xslt-config,xsltproc} + ln -s ${libxslt.dev}/bin/xslt-config opt/vagrant/embedded/bin + ln -s ${libxslt.bin}/bin/xsltproc opt/vagrant/embedded/bin + + '' + (stdenv.lib.optionalString (! stdenv.isDarwin) '' # ruby: erb, gem, irb, rake, rdoc, ri, ruby rm opt/vagrant/embedded/bin/{erb,gem,irb,rake,rdoc,ri,ruby} ln -s ${ruby}/bin/erb opt/vagrant/embedded/bin @@ -101,24 +117,10 @@ in stdenv.mkDerivation rec { ln -s $lib opt/vagrant/embedded/lib/''${lib##*/} done - # libiconv: iconv - rm opt/vagrant/embedded/bin/iconv - ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin - - # libxml: xml2-config, xmlcatalog, xmllint - rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint} - ln -s ${libxml2.dev}/bin/xml2-config opt/vagrant/embedded/bin - ln -s ${libxml2.bin}/bin/xmlcatalog opt/vagrant/embedded/bin - ln -s ${libxml2.bin}/bin/xmllint opt/vagrant/embedded/bin - - # libxslt: xslt-config, xsltproc - rm opt/vagrant/embedded/bin/{xslt-config,xsltproc} - ln -s ${libxslt.dev}/bin/xslt-config opt/vagrant/embedded/bin - ln -s ${libxslt.bin}/bin/xsltproc opt/vagrant/embedded/bin - # libffi ln -s ${libffi}/lib/libffi.so.6 opt/vagrant/embedded/lib/libffi.so.6 + '') + '' mkdir -p "$out" cp -r opt "$out" cp -r usr/bin "$out" |