alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

treewide: Make explicit that 'dev' output of libusb1 is used

Browse source
This commit is contained in:
Tuomas Tynkkynen 2016-04-16 20:40:03 +03:00 committed by Vladimír Čunát
parent b5c6069def
commit 9d5ba6ba68
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/graphics/digikam/default.nix
View file

@ -71,7 +71,7 @@ let
# Help digiKam find libusb, otherwise gphoto2 support is disabled # Help digiKam find libusb, otherwise gphoto2 support is disabled
cmakeFlags = [ cmakeFlags = [
"-DLIBUSB_LIBRARIES=${libusb1.out}/lib" "-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_BALOOSUPPORT=ON"
"-DENABLE_KDEPIMLIBSSUPPORT=ON" "-DENABLE_KDEPIMLIBSSUPPORT=ON"
"-DENABLE_LCMS2=ON" ] "-DENABLE_LCMS2=ON" ]

2
pkgs/development/tools/misc/uhd/default.nix
View file

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
cmakeFlags = "-DLIBUSB_INCLUDE_DIRS=${libusb1}/include/libusb-1.0"; cmakeFlags = "-DLIBUSB_INCLUDE_DIRS=${libusb1.dev}/include/libusb-1.0";
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ python pythonPackages.pyramid_mako orc libusb1 boost ]; buildInputs = [ python pythonPackages.pyramid_mako orc libusb1 boost ];

2
pkgs/misc/drivers/hplip/3.15.9.nix
View file

@ -83,7 +83,7 @@ stdenv.mkDerivation {
find . -type f -exec sed -i \ find . -type f -exec sed -i \
-e s,/etc/hp,$out/etc/hp, \ -e s,/etc/hp,$out/etc/hp, \
-e s,/etc/sane.d,$out/etc/sane.d, \ -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/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor, \
-e s,/usr/lib/systemd/system,$out/lib/systemd/system, \ -e s,/usr/lib/systemd/system,$out/lib/systemd/system, \
-e s,/var/lib/hp,$out/var/lib/hp, \ -e s,/var/lib/hp,$out/var/lib/hp, \

2
pkgs/misc/drivers/hplip/default.nix
View file

@ -84,7 +84,7 @@ stdenv.mkDerivation {
find . -type f -exec sed -i \ find . -type f -exec sed -i \
-e s,/etc/hp,$out/etc/hp, \ -e s,/etc/hp,$out/etc/hp, \
-e s,/etc/sane.d,$out/etc/sane.d, \ -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/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor, \
-e s,/usr/lib/systemd/system,$out/lib/systemd/system, \ -e s,/usr/lib/systemd/system,$out/lib/systemd/system, \
-e s,/var/lib/hp,$out/var/lib/hp, \ -e s,/var/lib/hp,$out/var/lib/hp, \

2
pkgs/top-level/python-packages.nix
View file

@ -26863,7 +26863,7 @@ in modules // {
# Fix the USB backend library lookup # Fix the USB backend library lookup
postPatch = '' 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; } 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 sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py
''; '';