From a1176b9ee76d2e2cbffc88ac08b6d174f242de35 Mon Sep 17 00:00:00 2001 From: Justin ! Date: Tue, 11 Aug 2026 00:01:38 -0400 Subject: [PATCH] gutenprint: remove `gimp2Support` since `gimp2` is deprecated The project sourgeforge page state clearly that the gimp plugin is compatible with GIMP 2.x, so this has probably not been tested and doesn't work since GIMP 3.x is alias to the `gimp` package. This is part of #410814 --- pkgs/by-name/gu/gutenprint/package.nix | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/gu/gutenprint/package.nix b/pkgs/by-name/gu/gutenprint/package.nix index fc7888434245..74023c1e8e13 100644 --- a/pkgs/by-name/gu/gutenprint/package.nix +++ b/pkgs/by-name/gu/gutenprint/package.nix @@ -7,7 +7,6 @@ pkg-config, ijs, zlib, - gimp2Support ? false, gimp, cupsSupport ? true, cups, @@ -37,10 +36,6 @@ stdenv.mkDerivation (finalAttrs: { ijs zlib ] - ++ lib.optionals gimp2Support [ - gimp.gtk - gimp - ] ++ lib.optionals cupsSupport [ cups libusb1 @@ -53,19 +48,13 @@ stdenv.mkDerivation (finalAttrs: { # FIXME: hacky because we modify generated configure, but I haven't found a better way. # makeFlags doesn't change this everywhere (e.g. in cups-genppdupdate). - preConfigure = - lib.optionalString cupsSupport '' - sed -i \ - -e "s,cups_conf_datadir=.*,cups_conf_datadir=\"$out/share/cups\",g" \ - -e "s,cups_conf_serverbin=.*,cups_conf_serverbin=\"$out/lib/cups\",g" \ - -e "s,cups_conf_serverroot=.*,cups_conf_serverroot=\"$out/etc/cups\",g" \ - configure - '' - + lib.optionalString gimp2Support '' - sed -i \ - -e "s,gimp2_plug_indir=.*,gimp2_plug_indir=\"$out/lib/gimp/${gimp.apiVersion}\",g" \ - configure - ''; + preConfigure = lib.optionalString cupsSupport '' + sed -i \ + -e "s,cups_conf_datadir=.*,cups_conf_datadir=\"$out/share/cups\",g" \ + -e "s,cups_conf_serverbin=.*,cups_conf_serverbin=\"$out/lib/cups\",g" \ + -e "s,cups_conf_serverroot=.*,cups_conf_serverroot=\"$out/etc/cups\",g" \ + configure + ''; enableParallelBuilding = true;