diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-07-03 05:44:35 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-07-03 21:07:45 +0200 |
| commit | 3b701aa4b6c0f9edd1059d25cecefdd4379212fe (patch) | |
| tree | f234bfd94a568b12cee3c27542c7a5ac6e0f870a /pkgs/applications/graphics/gimp/default.nix | |
| parent | 55668eb671b915b49bcaaeec4518cc49d8de0a99 (diff) | |
| download | nixpkgs-3b701aa4b6c0f9edd1059d25cecefdd4379212fe.tar nixpkgs-3b701aa4b6c0f9edd1059d25cecefdd4379212fe.tar.gz nixpkgs-3b701aa4b6c0f9edd1059d25cecefdd4379212fe.tar.bz2 nixpkgs-3b701aa4b6c0f9edd1059d25cecefdd4379212fe.tar.lz nixpkgs-3b701aa4b6c0f9edd1059d25cecefdd4379212fe.tar.xz nixpkgs-3b701aa4b6c0f9edd1059d25cecefdd4379212fe.tar.zst nixpkgs-3b701aa4b6c0f9edd1059d25cecefdd4379212fe.zip | |
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
Diffstat (limited to 'pkgs/applications/graphics/gimp/default.nix')
| -rw-r--r-- | pkgs/applications/graphics/gimp/default.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 9e448fa23a4..1eee37223f1 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -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" ''; |