vagrant: against libffi (#26440)
* Link vagrant against libffi Vagrant requires libffi to run with (vagrant-fsnotify)[https://github.com/adrienkohlbecker/vagrant-fsnotify]. * vagrant: nitpick
This commit is contained in:
parent
0d437af073
commit
0576bda744
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, fetchurl, fetchpatch, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconv
|
{ 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
|
let
|
||||||
version = "1.9.5";
|
version = "1.9.5";
|
||||||
|
@ -96,8 +96,10 @@ in stdenv.mkDerivation rec {
|
||||||
ln -s ${ruby}/bin/ruby opt/vagrant/embedded/bin
|
ln -s ${ruby}/bin/ruby opt/vagrant/embedded/bin
|
||||||
|
|
||||||
# ruby libs
|
# ruby libs
|
||||||
rm -rf opt/vagrant/embedded/lib
|
rm -rf opt/vagrant/embedded/lib/*
|
||||||
ln -s ${ruby}/lib opt/vagrant/embedded/lib
|
for lib in ${ruby}/lib/*; do
|
||||||
|
ln -s $lib opt/vagrant/embedded/lib/''${lib##*/}
|
||||||
|
done
|
||||||
|
|
||||||
# libiconv: iconv
|
# libiconv: iconv
|
||||||
rm opt/vagrant/embedded/bin/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.dev}/bin/xslt-config opt/vagrant/embedded/bin
|
||||||
ln -s ${libxslt.bin}/bin/xsltproc 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"
|
mkdir -p "$out"
|
||||||
cp -r opt "$out"
|
cp -r opt "$out"
|
||||||
cp -r usr/bin "$out"
|
cp -r usr/bin "$out"
|
||||||
|
|
Loading…
Reference in a new issue