diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-16 20:40:03 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:00:47 +0200 |
| commit | 9d5ba6ba68a5693244a8c29cade0fb2dd3ada050 (patch) | |
| tree | 2d02598452320c1dd801d55dcd89f60708653f66 | |
| parent | b5c6069defcc0f5d8b5cd20cd13d6d1b2363759e (diff) | |
| download | nixpkgs-9d5ba6ba68a5693244a8c29cade0fb2dd3ada050.tar nixpkgs-9d5ba6ba68a5693244a8c29cade0fb2dd3ada050.tar.gz nixpkgs-9d5ba6ba68a5693244a8c29cade0fb2dd3ada050.tar.bz2 nixpkgs-9d5ba6ba68a5693244a8c29cade0fb2dd3ada050.tar.lz nixpkgs-9d5ba6ba68a5693244a8c29cade0fb2dd3ada050.tar.xz nixpkgs-9d5ba6ba68a5693244a8c29cade0fb2dd3ada050.tar.zst nixpkgs-9d5ba6ba68a5693244a8c29cade0fb2dd3ada050.zip | |
treewide: Make explicit that 'dev' output of libusb1 is used
| -rw-r--r-- | pkgs/applications/graphics/digikam/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/uhd/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/drivers/hplip/3.15.9.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/drivers/hplip/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 453dc080995..f38e402ce92 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -71,7 +71,7 @@ let # Help digiKam find libusb, otherwise gphoto2 support is disabled cmakeFlags = [ "-DLIBUSB_LIBRARIES=${libusb1.out}/lib" - "-DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0" + "-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0" "-DENABLE_BALOOSUPPORT=ON" "-DENABLE_KDEPIMLIBSSUPPORT=ON" "-DENABLE_LCMS2=ON" ] diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix index 786a7d8cdb5..9c0d81cf004 100644 --- a/pkgs/development/tools/misc/uhd/default.nix +++ b/pkgs/development/tools/misc/uhd/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - cmakeFlags = "-DLIBUSB_INCLUDE_DIRS=${libusb1}/include/libusb-1.0"; + cmakeFlags = "-DLIBUSB_INCLUDE_DIRS=${libusb1.dev}/include/libusb-1.0"; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ python pythonPackages.pyramid_mako orc libusb1 boost ]; diff --git a/pkgs/misc/drivers/hplip/3.15.9.nix b/pkgs/misc/drivers/hplip/3.15.9.nix index 1162cc4f00d..5c989594b3b 100644 --- a/pkgs/misc/drivers/hplip/3.15.9.nix +++ b/pkgs/misc/drivers/hplip/3.15.9.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation { find . -type f -exec sed -i \ -e s,/etc/hp,$out/etc/hp, \ -e s,/etc/sane.d,$out/etc/sane.d, \ - -e s,/usr/include/libusb-1.0,${libusb1}/include/libusb-1.0, \ + -e s,/usr/include/libusb-1.0,${libusb1.dev}/include/libusb-1.0, \ -e s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor, \ -e s,/usr/lib/systemd/system,$out/lib/systemd/system, \ -e s,/var/lib/hp,$out/var/lib/hp, \ diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index d90bb66410c..32997f98b21 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation { find . -type f -exec sed -i \ -e s,/etc/hp,$out/etc/hp, \ -e s,/etc/sane.d,$out/etc/sane.d, \ - -e s,/usr/include/libusb-1.0,${libusb1}/include/libusb-1.0, \ + -e s,/usr/include/libusb-1.0,${libusb1.dev}/include/libusb-1.0, \ -e s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor, \ -e s,/usr/lib/systemd/system,$out/lib/systemd/system, \ -e s,/var/lib/hp,$out/var/lib/hp, \ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 198f9c33324..de515da5dd7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26863,7 +26863,7 @@ in modules // { # Fix the USB backend library lookup postPatch = '' - libusb=${pkgs.libusb1}/include/libusb-1.0 + libusb=${pkgs.libusb1.dev}/include/libusb-1.0 test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py ''; |