diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-01-24 09:29:44 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-01-24 10:03:36 +0200 |
| commit | 69498299dd681fe773b474c3dec2d9b5bec468f0 (patch) | |
| tree | eb26fa5fed098e3ac5fb03cf3ebf752355dad12d /pkgs | |
| parent | 3916cf476b363e072b27b25b86f5c8f706222e86 (diff) | |
| download | nixlib-69498299dd681fe773b474c3dec2d9b5bec468f0.tar nixlib-69498299dd681fe773b474c3dec2d9b5bec468f0.tar.gz nixlib-69498299dd681fe773b474c3dec2d9b5bec468f0.tar.bz2 nixlib-69498299dd681fe773b474c3dec2d9b5bec468f0.tar.lz nixlib-69498299dd681fe773b474c3dec2d9b5bec468f0.tar.xz nixlib-69498299dd681fe773b474c3dec2d9b5bec468f0.tar.zst nixlib-69498299dd681fe773b474c3dec2d9b5bec468f0.zip | |
treewide: Mass replace 'libusb1}/lib' to refer the 'out' output
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/graphics/digikam/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/mobile/flashtool/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index bdf8077624db..bc3678811a5b 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # Help digiKam find libusb, otherwise gphoto2 support is disabled cmakeFlags = [ - "-DLIBUSB_LIBRARIES=${libusb1}/lib" + "-DLIBUSB_LIBRARIES=${libusb1.out}/lib" "-DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0" "-DDIGIKAMSC_COMPILE_LIBKFACE=ON" ]; diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index d22eeb6c2138..b33fc13224a3 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildPhase = '' ln -s ${platformTools}/platform-tools/adb x10flasher_lib/adb.linux ln -s ${platformTools}/platform-tools/fastboot x10flasher_lib/fastboot.linux - ln -s ${libusb1}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so + ln -s ${libusb1.out}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so chmod +x x10flasher_lib/unyaffs.linux.x86 x10flasher_lib/bin2elf x10flasher_lib/bin2sin patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" x10flasher_lib/unyaffs.linux.x86 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 171a5f8b8ad8..289fec567f57 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22018,7 +22018,7 @@ in modules // { # Fix the USB backend library lookup postPatch = '' - libusb=${pkgs.libusb1}/lib/libusb-1.0.so + libusb=${pkgs.libusb1.out}/lib/libusb-1.0.so test -f $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } sed -i -e "s|libname = .*|libname = \"$libusb\"|" usb/backend/libusb1.py ''; |