From ffdeaff3de2b682d46d77d3f6f3eb1172452d8d5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 28 Dec 2024 01:50:47 +0100 Subject: [PATCH] =?UTF-8?q?gimp:=203.0.0-RC1=20=E2=86=92=203.0.0-RC2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://www.gimp.org/news/2024/12/27/gimp-3-0-RC2-released/ https://github.com/GNOME/gimp/compare/GIMP_3_0_0_RC1...GIMP_3_0_0_RC2 --- pkgs/applications/graphics/gimp/default.nix | 6 +++--- .../graphics/gimp/hardcode-plugin-interpreters.patch | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 6ff35b3e59df..114a5ba7ec28 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -80,7 +80,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gimp"; - version = "3.0.0-RC1"; + version = "3.0.0-RC2"; outputs = [ "out" @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://download.gimp.org/gimp/v${lib.versions.majorMinor finalAttrs.version}/gimp-${finalAttrs.version}.tar.xz"; - hash = "sha256-s9CyZMXjjnifqvNBcAM5fzJAAUxZx/QX+co705xf+2Y="; + hash = "sha256-9NL5bfGAzlVD+LKzVwe5vxFFnwD3Jspz2i9AbWhtnbc="; }; patches = [ @@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { # TODO: This now only appears to be used on Windows. (replaceVars ./hardcode-plugin-interpreters.patch { python_interpreter = python.interpreter; - PYTHON_PATH = null; + PYTHON_EXE = null; }) # D-Bus configuration is not available in the build sandbox diff --git a/pkgs/applications/graphics/gimp/hardcode-plugin-interpreters.patch b/pkgs/applications/graphics/gimp/hardcode-plugin-interpreters.patch index 13e37da3bd24..6a0ec0af6262 100644 --- a/pkgs/applications/graphics/gimp/hardcode-plugin-interpreters.patch +++ b/pkgs/applications/graphics/gimp/hardcode-plugin-interpreters.patch @@ -1,8 +1,8 @@ --- a/plug-ins/python/pygimp.interp.in +++ b/plug-ins/python/pygimp.interp.in -@@ -2,4 +2,4 @@ python=@PYTHON_PATH@ - python3=@PYTHON_PATH@python.exe - /usr/bin/python=@PYTHON_PATH@python.exe - /usr/bin/python3=@PYTHON_PATH@python.exe +@@ -2,4 +2,4 @@ python=@PYTHON_EXE@ + python3=@PYTHON_EXE@ + /usr/bin/python=@PYTHON_EXE@ + /usr/bin/python3=@PYTHON_EXE@ -:Python:E::py::python3: +:Python:E::py::@python_interpreter@: