diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 18ace779c905..63f9f520e6f0 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -77,7 +77,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gimp"; - version = "2.99.10-unstable-2022-06-28"; + version = "2.99.12-unstable-2022-08-31"; outputs = [ "out" @@ -92,8 +92,8 @@ stdenv.mkDerivation (finalAttrs: { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gimp"; - rev = "256b2d9615af2ba6dfcfdc32cc34a437aee214b3"; - hash = "sha256-ITL5nb8fka5Xj+6/JthGRTVVvTDd7LED49IuhZZNk4U="; + rev = "a791151ed05b6e2f7b0ecb71db8be9629d61f5df"; + hash = "sha256-0IIQwJW/HwkvKmjrs2xOhbpyLvvqJ0PR3q75PF+b/Ac="; }; patches = [ @@ -123,10 +123,6 @@ stdenv.mkDerivation (finalAttrs: { # https://salsa.debian.org/iso-codes-team/iso-codes/merge_requests/11 ./fix-isocodes-paths.patch - # Skip broken dependency in Windows code. - # https://gitlab.gnome.org/GNOME/gimp/-/issues/7907 - ./skip-win.patch - # Make the babl-0.1 patch apply (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/06b481a3ecf49563050935ad0e965a664648e450.patch"; @@ -248,6 +244,8 @@ stdenv.mkDerivation (finalAttrs: { "-Djpeg-xl=disabled" # Broken references "-Dgi-docgen=disabled" + # Removed pkg-config variable + "-Dheif=disabled" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-Dalsa=disabled" @@ -295,6 +293,8 @@ stdenv.mkDerivation (finalAttrs: { lib.makeBinPath [ # for dot for gegl:introspect (Debug ยป Show Image Graph, hidden by default on stable release) graphviz + # for gimp-script-fu-interpreter-3.0 invoked by shebang of some plug-ins + "$out" ] }") ''; diff --git a/pkgs/applications/graphics/gimp/fix-isocodes-paths.patch b/pkgs/applications/graphics/gimp/fix-isocodes-paths.patch index 32ed7babbf6a..cb10776d4802 100644 --- a/pkgs/applications/graphics/gimp/fix-isocodes-paths.patch +++ b/pkgs/applications/graphics/gimp/fix-isocodes-paths.patch @@ -1,11 +1,11 @@ diff --git a/meson.build b/meson.build -index a1ec1f67b6..8ce50973f7 100644 +index 6a19df48a1..3fd77077c1 100644 --- a/meson.build +++ b/meson.build -@@ -864,8 +864,8 @@ +@@ -924,8 +924,8 @@ endif isocodes = dependency('iso-codes', required: false) if isocodes.found() - isocodes_prefix = isocodes.get_pkgconfig_variable('prefix') + isocodes_prefix = isocodes.get_variable(pkgconfig: 'prefix') - isocodes_location = isocodes_prefix / get_option('datadir') / 'xml' / 'iso-codes' - isocodes_localedir= isocodes_prefix / get_option('datadir') / 'locale' + isocodes_location = isocodes_prefix / 'share' / 'xml' / 'iso-codes' diff --git a/pkgs/applications/graphics/gimp/skip-win.patch b/pkgs/applications/graphics/gimp/skip-win.patch deleted file mode 100644 index 5689862fe57a..000000000000 --- a/pkgs/applications/graphics/gimp/skip-win.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/build/windows/meson.build b/build/windows/meson.build -index 8df68256f6..9cd76ad660 100644 ---- a/build/windows/meson.build -+++ b/build/windows/meson.build -@@ -1,4 +1,5 @@ - # Windows specific -+subdir_done() - - configure_file( - input : 'gimp-plug-ins.rc.in',