summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2016-01-24 09:29:45 +0200
committerTuomas Tynkkynen <tuomas@tuxera.com>2016-01-24 10:03:36 +0200
commit91b40bd9d24a35dedfbceb0d3eeb72dcc0f27d5b (patch)
treea078d641e1c2918eecb48f80ddc125951aa54903 /pkgs
parent69498299dd681fe773b474c3dec2d9b5bec468f0 (diff)
downloadnixpkgs-91b40bd9d24a35dedfbceb0d3eeb72dcc0f27d5b.tar
nixpkgs-91b40bd9d24a35dedfbceb0d3eeb72dcc0f27d5b.tar.gz
nixpkgs-91b40bd9d24a35dedfbceb0d3eeb72dcc0f27d5b.tar.bz2
nixpkgs-91b40bd9d24a35dedfbceb0d3eeb72dcc0f27d5b.tar.lz
nixpkgs-91b40bd9d24a35dedfbceb0d3eeb72dcc0f27d5b.tar.xz
nixpkgs-91b40bd9d24a35dedfbceb0d3eeb72dcc0f27d5b.tar.zst
nixpkgs-91b40bd9d24a35dedfbceb0d3eeb72dcc0f27d5b.zip
treewide: Mass replace 'libusb}/lib' to refer the 'out' output
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/misc/nut/default.nix2
-rw-r--r--pkgs/development/libraries/scmccid/default.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix
index 3e972f672cc..25c90488092 100644
--- a/pkgs/applications/misc/nut/default.nix
+++ b/pkgs/applications/misc/nut/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   
   postInstall = ''
     wrapProgram $out/bin/nut-scanner --prefix LD_LIBRARY_PATH : \
-      "$out/lib:${neon}/lib:${libusb}/lib:${avahi}/lib:${freeipmi}/lib"
+      "$out/lib:${neon}/lib:${libusb.out}/lib:${avahi}/lib:${freeipmi}/lib"
   '';
 
   meta = {
diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix
index f9845d60b49..f88bd64f597 100644
--- a/pkgs/development/libraries/scmccid/default.nix
+++ b/pkgs/development/libraries/scmccid/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ patchelf ];
 
   installPhase = ''
-    RPATH=${libusb}/lib:${stdenv.cc.libc.out}/lib
+    RPATH=${libusb.out}/lib:${stdenv.cc.libc.out}/lib
 
     for a in proprietary/*/Contents/Linux/*.so*; do
         if ! test -L $a; then