pyrox.dev / nixpkgs
lol
fork atom

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

Tuomas Tynkkynen 69498299 3916cf47

+3 -3
unified split
+1 -1
pkgs/applications/graphics/digikam/default.nix
··· 27 27 28 28 # Help digiKam find libusb, otherwise gphoto2 support is disabled 29 29 cmakeFlags = [ 30 - "-DLIBUSB_LIBRARIES=${libusb1}/lib" 30 + "-DLIBUSB_LIBRARIES=${libusb1.out}/lib" 31 31 "-DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0" 32 32 "-DDIGIKAMSC_COMPILE_LIBKFACE=ON" 33 33 ];
+1 -1
pkgs/development/mobile/flashtool/default.nix
··· 33 33 buildPhase = '' 34 34 ln -s ${platformTools}/platform-tools/adb x10flasher_lib/adb.linux 35 35 ln -s ${platformTools}/platform-tools/fastboot x10flasher_lib/fastboot.linux 36 - ln -s ${libusb1}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so 36 + ln -s ${libusb1.out}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so 37 37 38 38 chmod +x x10flasher_lib/unyaffs.linux.x86 x10flasher_lib/bin2elf x10flasher_lib/bin2sin 39 39 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" x10flasher_lib/unyaffs.linux.x86
+1 -1
pkgs/top-level/python-packages.nix
··· 22018 22018 22019 22019 # Fix the USB backend library lookup 22020 22020 postPatch = '' 22021 - libusb=${pkgs.libusb1}/lib/libusb-1.0.so 22021 + libusb=${pkgs.libusb1.out}/lib/libusb-1.0.so 22022 22022 test -f $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } 22023 22023 sed -i -e "s|libname = .*|libname = \"$libusb\"|" usb/backend/libusb1.py 22024 22024 '';