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

cnijfilter_4_00: request libusb1 directly

Browse Source
This commit is contained in:
Florian Klink 2020-04-24 23:50:38 +02:00
parent 2c621ff4f4
commit f5368e0194
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{ stdenv, lib, fetchzip, { stdenv, lib, fetchzip,
autoconf, automake, libtool, autoconf, automake, libtool,
cups, popt, libtiff, libpng, cups, popt, libtiff, libpng,
ghostscript, glib, libusb, libxml2 }: ghostscript, glib, libusb1, libxml2 }:
/* this derivation is basically just a transcription of the rpm .spec /* this derivation is basically just a transcription of the rpm .spec
file included in the tarball */ file included in the tarball */
@ -32,7 +32,7 @@ in stdenv.mkDerivation {
buildInputs = [ autoconf libtool automake buildInputs = [ autoconf libtool automake
cups popt libtiff libpng cups popt libtiff libpng
ghostscript glib libusb libxml2 ]; ghostscript glib libusb1 libxml2 ];
# patches from https://github.com/tokiclover/bar-overlay/tree/master/net-print/cnijfilter # patches from https://github.com/tokiclover/bar-overlay/tree/master/net-print/cnijfilter
patches = [ patches = [
@ -85,7 +85,7 @@ in stdenv.mkDerivation {
cd ../lgmon2 cd ../lgmon2
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-libpath=$out/lib/bjlib --enable-progpath=$out/bin ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib --enable-progpath=$out/bin
cd ..; cd ..;

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

@ -25239,9 +25239,7 @@ in
# this driver ships with pre-compiled 32-bit binary libraries # this driver ships with pre-compiled 32-bit binary libraries
cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { }; cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { };
cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 { cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 { };
libusb = libusb1;
};
cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 {
libusb = libusb1; libusb = libusb1;