diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-23 00:04:39 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-23 00:04:39 +0300 |
commit | 51ad423716ec959aa6056660202e59a4b400ca4e (patch) | |
tree | c29cb4491c03cd10deb14823d8d7cb8e29f8f69a /pkgs/misc/cups | |
parent | d559c07bbe1aa0be1662cdb5d697dcbac0f34b0a (diff) | |
download | nixlib-51ad423716ec959aa6056660202e59a4b400ca4e.tar nixlib-51ad423716ec959aa6056660202e59a4b400ca4e.tar.gz nixlib-51ad423716ec959aa6056660202e59a4b400ca4e.tar.bz2 nixlib-51ad423716ec959aa6056660202e59a4b400ca4e.tar.lz nixlib-51ad423716ec959aa6056660202e59a4b400ca4e.tar.xz nixlib-51ad423716ec959aa6056660202e59a4b400ca4e.tar.zst nixlib-51ad423716ec959aa6056660202e59a4b400ca4e.zip |
treewide: Use makeLibraryPath in 'patchelf --set-rpath' calls
Diffstat (limited to 'pkgs/misc/cups')
-rw-r--r-- | pkgs/misc/cups/drivers/samsung/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/default.nix index 34b5f58aed51..26ab793f3155 100644 --- 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 |