Skip to content

gimp: condition python2 behind new withPython argument #203395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dotlambda merged 1 commit into from
Nov 30, 2022
Merged

gimp: condition python2 behind new withPython argument #203395

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions pkgs/applications/graphics/gimp/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
, ghostscript
, aalib
, shared-mime-info
, python2
, libexif
, gettext
, makeWrapper
Expand All @@ -48,6 +47,8 @@
, AppKit
, Cocoa
, gtk-mac-integration-gtk2
, withPython ? false
, python2 ? null
Copy link
Member

@SuperSandro2000 SuperSandro2000 Nov 30, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need the ? null here? We are not going to drop the python2 package from the tree.

#203752

Copy link
Member

@dotlambda dotlambda Nov 30, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might in the future.

Copy link
Member

@SuperSandro2000 SuperSandro2000 Nov 30, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then we can still do this in the future or just remove the dead code.

}:

let
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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;
Expand Down