gimp: Fix interpreter path
GIMP uses python interpreter specified in pygimp.interp file for running Python plug-ins, so any Python related wrapping is useless. It will pick up and use the python from build PATH. Let’s use a python environment containing pygtk, which is needed by many plug-ins. Closes: https://github.com/NixOS/nixpkgs/issues/87883
This commit is contained in:
parent
55668eb671
commit
3b701aa4b6
1 changed files with 4 additions and 8 deletions
|
@ -28,9 +28,10 @@
|
|||
, ghostscript
|
||||
, aalib
|
||||
, shared-mime-info
|
||||
, python2Packages
|
||||
, python2
|
||||
, libexif
|
||||
, gettext
|
||||
, makeWrapper
|
||||
, xorg
|
||||
, glib-networking
|
||||
, libmypaint
|
||||
|
@ -47,7 +48,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
inherit (python2Packages) pygtk wrapPython python;
|
||||
python = python2.withPackages (pp: [ pp.pygtk ]);
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "gimp";
|
||||
version = "2.10.20";
|
||||
|
@ -63,7 +64,7 @@ in stdenv.mkDerivation rec {
|
|||
pkgconfig
|
||||
intltool
|
||||
gettext
|
||||
wrapPython
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
@ -97,7 +98,6 @@ in stdenv.mkDerivation rec {
|
|||
libwebp
|
||||
libheif
|
||||
python
|
||||
pygtk
|
||||
libexif
|
||||
xorg.libXpm
|
||||
glib-networking
|
||||
|
@ -116,8 +116,6 @@ in stdenv.mkDerivation rec {
|
|||
gegl
|
||||
];
|
||||
|
||||
pythonPath = [ pygtk ];
|
||||
|
||||
# Check if librsvg was built with --disable-pixbuf-loader.
|
||||
PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}";
|
||||
|
||||
|
@ -136,9 +134,7 @@ in stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn $out/lib/gimp/${passthru.majorVersion}/plug-ins/
|
||||
wrapProgram $out/bin/gimp-${lib.versions.majorMinor version} \
|
||||
--prefix PYTHONPATH : "$PYTHONPATH" \
|
||||
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
|
||||
'';
|
||||
|
||||
|
|
Loading…
Reference in a new issue