Merge pull request #203395 from LibreCybernetics/gimp-remove-python2-dep

gimp: condition python2 behind new withPython argument
This commit is contained in:
Robert Schütz 2022-11-29 18:08:04 -08:00 committed by GitHub
commit 194fd9b484
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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;