public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cnijfilter2: request libusb1 directly

Browse Source
This commit is contained in:
Florian Klink 2020-04-24 23:53:01 +02:00
parent f5368e0194
commit d0e4ecb182
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/misc/cups/drivers/cnijfilter2/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb, libtool { stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb1, libtool
, withDebug ? false }: , withDebug ? false }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -12,7 +12,7 @@ stdenv.mkDerivation {
}; };
buildInputs = [ buildInputs = [
cups automake autoconf glib libxml2 libusb libtool cups automake autoconf glib libxml2 libusb1 libtool
]; ];
# lgmon3's --enable-libdir flag is used soley for specifying in which # lgmon3's --enable-libdir flag is used soley for specifying in which
@ -37,7 +37,7 @@ stdenv.mkDerivation {
cd lgmon3 cd lgmon3
substituteInPlace src/Makefile.am \ substituteInPlace src/Makefile.am \
--replace /usr/include/libusb-1.0 \ --replace /usr/include/libusb-1.0 \
${libusb.dev}/include/libusb-1.0 ${libusb1.dev}/include/libusb-1.0
./autogen.sh --prefix=$out --enable-progpath=$out/bin \ ./autogen.sh --prefix=$out --enable-progpath=$out/bin \
--datadir=$out/share \ --datadir=$out/share \
--enable-libdir=/var/cache/cups --enable-libdir=/var/cache/cups

4
pkgs/top-level/all-packages.nix
View File

@ -25241,9 +25241,7 @@ in
cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 { }; cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 { };
cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { };
libusb = libusb1;
};
darcnes = callPackage ../misc/emulators/darcnes { }; darcnes = callPackage ../misc/emulators/darcnes { };