public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mboes-vagrant-ld-path-fix'

This commit is contained in:
Mateusz Kowalczyk 2015-12-16 17:20:06 +00:00
parent f45b8176c0 bb30c79f0b
commit c6549af6a9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/tools/vagrant/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconv { stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconv
, libxml2, libxslt }: , libxml2, libxslt, makeWrapper }:
assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
@ -35,6 +35,8 @@ stdenv.mkDerivation rec {
platforms = platforms.linux; platforms = platforms.linux;
}; };
buildInputs = [ makeWrapper ];
unpackPhase = '' unpackPhase = ''
${dpkg}/bin/dpkg-deb -x ${src} . ${dpkg}/bin/dpkg-deb -x ${src} .
''; '';
@ -89,6 +91,7 @@ stdenv.mkDerivation rec {
mkdir -p "$out" mkdir -p "$out"
cp -r opt "$out" cp -r opt "$out"
cp -r usr/bin "$out" cp -r usr/bin "$out"
wrapProgram $out/bin/vagrant --prefix LD_LIBRARY_PATH : $out/opt/vagrant/embedded/lib
''; '';
preFixup = '' preFixup = ''