lol

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

gimp: condition python2 behind new withPython argument

authored by

Robert Schütz and committed by
GitHub
194fd9b4 f0c3f994

+8 -4
+8 -4
pkgs/applications/graphics/gimp/default.nix
··· 30 30 , ghostscript 31 31 , aalib 32 32 , shared-mime-info 33 - , python2 34 33 , libexif 35 34 , gettext 36 35 , makeWrapper ··· 48 47 , AppKit 49 48 , Cocoa 50 49 , gtk-mac-integration-gtk2 50 + , withPython ? false 51 + , python2 ? null 51 52 }: 52 53 53 54 let ··· 116 117 shared-mime-info 117 118 libwebp 118 119 libheif 119 - python 120 - # Duplicated here because python.withPackages does not expose the dev output with pkg-config files 121 - python2.pkgs.pygtk 122 120 libexif 123 121 xorg.libXpm 124 122 glib-networking ··· 130 128 gtk-mac-integration-gtk2 131 129 ] ++ lib.optionals stdenv.isLinux [ 132 130 libgudev 131 + ] ++ lib.optionals withPython [ 132 + python 133 + # Duplicated here because python.withPackages does not expose the dev output with pkg-config files 134 + python2.pkgs.pygtk 133 135 ]; 134 136 135 137 # needed by gimp-2.0.pc ··· 144 146 "--with-icc-directory=/run/current-system/sw/share/color/icc" 145 147 # fix libdir in pc files (${exec_prefix} needs to be passed verbatim) 146 148 "--libdir=\${exec_prefix}/lib" 149 + ] ++ lib.optionals (!withPython) [ 150 + "--disable-python" # depends on Python2 which was EOLed on 2020-01-01 147 151 ]; 148 152 149 153 enableParallelBuilding = true;