ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 14:57:28 +03:00
Code Issues 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

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

@ -1,12 +1,12 @@
{ 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 */
let arch = let arch =
if stdenv.hostPlatform.system == "x86_64-linux" then "64" if stdenv.hostPlatform.system == "x86_64-linux" then "64"
else if stdenv.hostPlatform.system == "i686-linux" then "32" else if stdenv.hostPlatform.system == "i686-linux" then "32"
else throw "Unsupported system ${stdenv.hostPlatform.system}"; else throw "Unsupported system ${stdenv.hostPlatform.system}";
@ -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 = [
@ -53,10 +53,10 @@ in stdenv.mkDerivation {
configurePhase = '' configurePhase = ''
cd libs cd libs
./autogen.sh --prefix=$out ./autogen.sh --prefix=$out
cd ../bscc2sts cd ../bscc2sts
./autogen.sh ./autogen.sh
cd ../cnijnpr cd ../cnijnpr
./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib
@ -68,25 +68,25 @@ in stdenv.mkDerivation {
./autogen.sh --prefix=$out --enable-progpath=$out/bin ./autogen.sh --prefix=$out --enable-progpath=$out/bin
cd ../pstocanonij cd ../pstocanonij
./autogen.sh --prefix=$out --enable-progpath=$out/bin ./autogen.sh --prefix=$out --enable-progpath=$out/bin
cd ../backend cd ../backend
./autogen.sh --prefix=$out ./autogen.sh --prefix=$out
cd ../backendnet cd ../backendnet
./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 ../cmdtocanonij cd ../cmdtocanonij
./autogen.sh --prefix=$out --datadir=$out/share ./autogen.sh --prefix=$out --datadir=$out/share
cd ../cnijbe cd ../cnijbe
./autogen.sh --prefix=$out --enable-progpath=$out/bin ./autogen.sh --prefix=$out --enable-progpath=$out/bin
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;