Merge pull request #187420 from lorenz/patch-1

This commit is contained in:
Sandro 2022-08-21 04:21:35 +02:00 committed by GitHub
commit 28f291330c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2,7 +2,7 @@
{ stdenv, lib, fetchurl, makeWrapper, pkg-config { stdenv, lib, fetchurl, makeWrapper, pkg-config
, ijs, zlib , ijs, zlib
, gimp2Support ? false, gimp , gimp2Support ? false, gimp
, cupsSupport ? true, cups, libusb-compat-0_1, perl , cupsSupport ? true, cups, libusb1, perl
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ ijs zlib ] [ ijs zlib ]
++ lib.optionals gimp2Support [ gimp.gtk gimp ] ++ 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 [ configureFlags = lib.optionals cupsSupport [
"--disable-static-genppd" # should be harmless on NixOS "--disable-static-genppd" # should be harmless on NixOS