summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Brun <lorenz@brun.one>2022-08-19 00:17:30 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-08-21 02:26:47 +0000
commit7175b144a0f136c64b6bb3dddd985d5950112094 (patch)
tree1ec74680bd5b4b3087af6d0fc365ee7e3455b7e6
parentMerge pull request #187610 from NixOS/backport-187299-to-release-22.05 (diff)
downloadnixpkgs-origin/backport-187420-to-release-22.05.tar.gz
gutenprint: fix CUPS backendorigin/backport-187420-to-release-22.05
The CUPS backend was not built since gutenprint requires libusb1, not 0.1 (at least since ~2014). With this change CUPS detects printers relying on the pure gutenprint backend (like some dye sublimation printers). (cherry picked from commit c413232fc8048a0276bf0c923b7c4a264089fa10)
-rw-r--r--pkgs/misc/drivers/gutenprint/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix
index 6b1bfefd7014..f5a104fd08c3 100644
--- a/pkgs/misc/drivers/gutenprint/default.nix
+++ b/pkgs/misc/drivers/gutenprint/default.nix
@@ -2,7 +2,7 @@
{ stdenv, lib, fetchurl, makeWrapper, pkg-config
, ijs, zlib
, gimp2Support ? false, gimp
-, cupsSupport ? true, cups, libusb-compat-0_1, perl
+, cupsSupport ? true, cups, libusb1, perl
}:
stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ ijs zlib ]
++ lib.optionals gimp2Support [ gimp.gtk gimp ]
- ++ lib.optionals cupsSupport [ cups libusb-compat-0_1 perl ];
+ ++ lib.optionals cupsSupport [ cups libusb1 perl ];
configureFlags = lib.optionals cupsSupport [
"--disable-static-genppd" # should be harmless on NixOS