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/misc/cups/drivers/samsung/default.nix
+++ b/pkgs/misc/cups/drivers/samsung/default.nix
@@ -52,7 +52,7 @@ in stdenv.mkDerivation rec {

    mkdir -p $out/lib/sane
    my_patchelf \
-      --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/lib:${stdenv.glibc}/lib:${libusb}/lib:${libxml2}/lib \
+      --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/lib:${stdenv.lib.makeLibraryPath [ stdenv.glibc libusb libxml2 ] } \
      - ${arch}/libsane-smfp.so*
    install -m755 ${arch}/libsane-smfp.so* $out/lib/sane
    ln -s libsane-smfp.so.1.0.1 $out/lib/sane/libsane-smfp.so.1