From d3b71d535cb65381881df40e9d71c00644ba957a Mon Sep 17 00:00:00 2001 From: Fabián Heredia Montiel Date: Sat, 19 Nov 2022 10:52:05 -0600 Subject: gimp: condition python2 behind new withPython argument --- pkgs/applications/graphics/gimp/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/graphics/gimp') diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index ee733a0b1b0c0..4423ca61ff177 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -30,7 +30,6 @@ , ghostscript , aalib , shared-mime-info -, python2 , libexif , gettext , makeWrapper @@ -48,6 +47,8 @@ , AppKit , Cocoa , gtk-mac-integration-gtk2 +, withPython ? false +, python2 ? null }: let @@ -116,9 +117,6 @@ in stdenv.mkDerivation rec { shared-mime-info libwebp libheif - python - # Duplicated here because python.withPackages does not expose the dev output with pkg-config files - python2.pkgs.pygtk libexif xorg.libXpm glib-networking @@ -130,6 +128,10 @@ in stdenv.mkDerivation rec { gtk-mac-integration-gtk2 ] ++ lib.optionals stdenv.isLinux [ libgudev + ] ++ lib.optionals withPython [ + python + # Duplicated here because python.withPackages does not expose the dev output with pkg-config files + python2.pkgs.pygtk ]; # needed by gimp-2.0.pc @@ -144,6 +146,8 @@ in stdenv.mkDerivation rec { "--with-icc-directory=/run/current-system/sw/share/color/icc" # fix libdir in pc files (${exec_prefix} needs to be passed verbatim) "--libdir=\${exec_prefix}/lib" + ] ++ lib.optionals (!withPython) [ + "--disable-python" # depends on Python2 which was EOLed on 2020-01-01 ]; enableParallelBuilding = true; -- cgit 1.4.1