From bb30c79f0bff1a850cd80f2344167fcb6e821dae Mon Sep 17 00:00:00 2001 From: Mathieu Boespflug Date: Wed, 16 Dec 2015 18:14:40 +0100 Subject: [PATCH] vagrant: bring embedded/ libraries in scope of dynamic linker. --- pkgs/development/tools/vagrant/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 085807e1bfa..a39c53f676a 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 }: +, libxml2, libxslt, makeWrapper }: assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; + buildInputs = [ makeWrapper ]; + unpackPhase = '' ${dpkg}/bin/dpkg-deb -x ${src} . ''; @@ -89,6 +91,7 @@ stdenv.mkDerivation rec { mkdir -p "$out" cp -r opt "$out" cp -r usr/bin "$out" + wrapProgram $out/bin/vagrant --prefix LD_LIBRARY_PATH : $out/opt/vagrant/embedded/lib ''; preFixup = ''