treewide: Use makeLibraryPath in 'patchelf --set-rpath' calls

2016-08-23 00:04:39 +03:00
parent d559c07bbe
commit 51ad423716
10 changed files with 11 additions and 11 deletions
--- a/pkgs/development/python-modules/libgpuarray/cuda/default.nix
+++ b/pkgs/development/python-modules/libgpuarray/cuda/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage rec {

    function fixRunPath {
      p=$(patchelf --print-rpath $1)
-      patchelf --set-rpath "$p:${cudatoolkit}/lib:${clblas}/lib:${nvidia_x11}/lib" $1
+      patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ cudatoolkit clblas nvidia_x11 ]}" $1
    }

    fixRunPath Install/lib/libgpuarray.so