MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

treewide: Mass replace 'libusb1}/lib' to refer the 'out' output

Browse source
This commit is contained in:
Tuomas Tynkkynen 2016-01-24 09:29:44 +02:00
parent 3916cf476b
commit 69498299dd
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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"
];

2
pkgs/development/mobile/flashtool/default.nix
View file

@ -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

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

@ -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
'';