diff options
| author | Tim Jäger <jger.tm@gmail.com> | 2017-06-07 23:20:10 -0700 |
|---|---|---|
| committer | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-06-08 07:20:10 +0100 |
| commit | 0576bda744c4d17eee26d8e056937529f7e04e04 (patch) | |
| tree | 981e03dbec139f5ee8bb30fcfa06d16d8bb11602 /pkgs/development/tools/vagrant | |
| parent | 0d437af073ce6b55f337ba6a59141945b6070de2 (diff) | |
vagrant: against libffi (#26440)
* Link vagrant against libffi
Vagrant requires libffi to run
with (vagrant-fsnotify)[https://github.com/adrienkohlbecker/vagrant-fsnotify].
* vagrant: nitpick
Diffstat (limited to 'pkgs/development/tools/vagrant')
| -rw-r--r-- | pkgs/development/tools/vagrant/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 557d1fde79d5..8d86c96e4bfe 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconv -, libxml2, libxslt, makeWrapper, p7zip, xar, gzip, cpio }: +, libxml2, libxslt, libffi, makeWrapper, p7zip, xar, gzip, cpio }: let version = "1.9.5"; @@ -96,8 +96,10 @@ in stdenv.mkDerivation rec { 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 + rm -rf opt/vagrant/embedded/lib/* + for lib in ${ruby}/lib/*; do + ln -s $lib opt/vagrant/embedded/lib/''${lib##*/} + done # libiconv: iconv rm opt/vagrant/embedded/bin/iconv @@ -114,6 +116,9 @@ in stdenv.mkDerivation rec { 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" |