From ccb4558a91f6466eb2aee4caeb8cb6dd42b8a082 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 17 May 2018 17:38:06 +0200 Subject: oracle-instantclient: prefix LD_LIBRARY_PATH --- pkgs/development/libraries/oracle-instantclient/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index 9abb3e5f9e0..edb07800d98 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, glibc, patchelf, rpmextract, libaio, odbcSupport ? false, unixODBC }: +{ stdenv, requireFile, glibc, patchelf, rpmextract, libaio, makeWrapper, odbcSupport ? false, unixODBC }: assert odbcSupport -> unixODBC != null; @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { buildInputs = [ glibc ] ++ optional odbcSupport unixODBC; - nativeBuildInputs = [ rpmextract patchelf ]; + nativeBuildInputs = [ rpmextract patchelf makeWrapper ]; buildCommand = '' mkdir -p "${name}" @@ -70,6 +70,7 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --force-rpath --set-rpath "$out/lib:${libaio}/lib" \ $exe + wrapProgram $exe --prefix LD_LIBRARY_PATH ":" $out/lib done ''; -- cgit 1.4.1