Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

cnijfilter2: request libusb1 directly

+4 -6
+3 -3
pkgs/misc/cups/drivers/cnijfilter2/default.nix
··· 1 - { stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb, libtool 2 , withDebug ? false }: 3 4 stdenv.mkDerivation { ··· 12 }; 13 14 buildInputs = [ 15 - cups automake autoconf glib libxml2 libusb libtool 16 ]; 17 18 # lgmon3's --enable-libdir flag is used soley for specifying in which ··· 37 cd lgmon3 38 substituteInPlace src/Makefile.am \ 39 --replace /usr/include/libusb-1.0 \ 40 - ${libusb.dev}/include/libusb-1.0 41 ./autogen.sh --prefix=$out --enable-progpath=$out/bin \ 42 --datadir=$out/share \ 43 --enable-libdir=/var/cache/cups
··· 1 + { stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb1, libtool 2 , withDebug ? false }: 3 4 stdenv.mkDerivation { ··· 12 }; 13 14 buildInputs = [ 15 + cups automake autoconf glib libxml2 libusb1 libtool 16 ]; 17 18 # lgmon3's --enable-libdir flag is used soley for specifying in which ··· 37 cd lgmon3 38 substituteInPlace src/Makefile.am \ 39 --replace /usr/include/libusb-1.0 \ 40 + ${libusb1.dev}/include/libusb-1.0 41 ./autogen.sh --prefix=$out --enable-progpath=$out/bin \ 42 --datadir=$out/share \ 43 --enable-libdir=/var/cache/cups
+1 -3
pkgs/top-level/all-packages.nix
··· 25241 25242 cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 { }; 25243 25244 - cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { 25245 - libusb = libusb1; 25246 - }; 25247 25248 darcnes = callPackage ../misc/emulators/darcnes { }; 25249
··· 25241 25242 cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 { }; 25243 25244 + cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { }; 25245 25246 darcnes = callPackage ../misc/emulators/darcnes { }; 25247