diff options
| author | Florian Klink <flokli@flokli.de> | 2020-04-24 23:50:38 +0200 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2020-04-27 12:19:12 +0200 |
| commit | f5368e0194ad794a98bd1cbd90a5b09ff3f3b2e3 (patch) | |
| tree | 89af0cd5af5263be8ded6e0255cf6fa0241a4e21 | |
| parent | 2c621ff4f4ad4eb2467fc9f98bab327a25f2e3ac (diff) | |
| download | nixpkgs-f5368e0194ad794a98bd1cbd90a5b09ff3f3b2e3.tar nixpkgs-f5368e0194ad794a98bd1cbd90a5b09ff3f3b2e3.tar.gz nixpkgs-f5368e0194ad794a98bd1cbd90a5b09ff3f3b2e3.tar.bz2 nixpkgs-f5368e0194ad794a98bd1cbd90a5b09ff3f3b2e3.tar.lz nixpkgs-f5368e0194ad794a98bd1cbd90a5b09ff3f3b2e3.tar.xz nixpkgs-f5368e0194ad794a98bd1cbd90a5b09ff3f3b2e3.tar.zst nixpkgs-f5368e0194ad794a98bd1cbd90a5b09ff3f3b2e3.zip | |
cnijfilter_4_00: request libusb1 directly
| -rw-r--r-- | pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 11 insertions, 13 deletions
diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix index 679d8906994..9b328c20b71 100644 --- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, autoconf, automake, libtool, cups, popt, libtiff, libpng, - ghostscript, glib, libusb, libxml2 }: + ghostscript, glib, libusb1, libxml2 }: /* this derivation is basically just a transcription of the rpm .spec file included in the tarball */ -let arch = +let arch = if stdenv.hostPlatform.system == "x86_64-linux" then "64" else if stdenv.hostPlatform.system == "i686-linux" then "32" else throw "Unsupported system ${stdenv.hostPlatform.system}"; @@ -32,7 +32,7 @@ in stdenv.mkDerivation { buildInputs = [ autoconf libtool automake 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 = [ @@ -53,10 +53,10 @@ in stdenv.mkDerivation { configurePhase = '' cd libs - ./autogen.sh --prefix=$out + ./autogen.sh --prefix=$out cd ../bscc2sts - ./autogen.sh + ./autogen.sh cd ../cnijnpr ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib @@ -68,25 +68,25 @@ in stdenv.mkDerivation { ./autogen.sh --prefix=$out --enable-progpath=$out/bin cd ../pstocanonij - ./autogen.sh --prefix=$out --enable-progpath=$out/bin + ./autogen.sh --prefix=$out --enable-progpath=$out/bin cd ../backend ./autogen.sh --prefix=$out 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 ./autogen.sh --prefix=$out --datadir=$out/share cd ../cnijbe - ./autogen.sh --prefix=$out --enable-progpath=$out/bin + ./autogen.sh --prefix=$out --enable-progpath=$out/bin cd ../lgmon2 substituteInPlace src/Makefile.am \ --replace /usr/include/libusb-1.0 \ - ${libusb.dev}/include/libusb-1.0 - ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib --enable-progpath=$out/bin + ${libusb1.dev}/include/libusb-1.0 + ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib --enable-progpath=$out/bin cd ..; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2b58e1323d..6ead4f47408 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25239,9 +25239,7 @@ in # this driver ships with pre-compiled 32-bit binary libraries cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { }; - cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 { - libusb = libusb1; - }; + cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 { }; cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { libusb = libusb1; |