about summary refs log tree commit diff
path: root/pkgs/applications/graphics/gimp
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2023-03-17 14:53:51 +0100
committerJan Tojnar <jtojnar@gmail.com>2023-03-17 15:04:32 +0100
commit29638c4a7ee8efdc764e5f77fd68e03e86926036 (patch)
tree3f37f4ec3192e3de2a6a1a78bb3c2ec466b1c084 /pkgs/applications/graphics/gimp
parent94f5d6e5c2b9adf59330681bc661d70d0f7d964c (diff)
gimp-with-plugins: Use consistent GIMP version
In case `gimp` attribute from `gimpPlugins` scope is overridden to something different than the top-level one.
Diffstat (limited to 'pkgs/applications/graphics/gimp')
-rw-r--r--pkgs/applications/graphics/gimp/wrapper.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix
index 353990ca3a958..5b92093005e09 100644
--- a/pkgs/applications/graphics/gimp/wrapper.nix
+++ b/pkgs/applications/graphics/gimp/wrapper.nix
@@ -1,8 +1,9 @@
-{ lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome, plugins ? null}:
+{ lib, symlinkJoin, makeWrapper, gimpPlugins, gnome, plugins ? null}:
 
 let
+inherit (gimpPlugins) gimp;
 allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues gimpPlugins);
-selectedPlugins = lib.filter (pkg: pkg != gimpPlugins.gimp) (if plugins == null then allPlugins else plugins);
+selectedPlugins = lib.filter (pkg: pkg != gimp) (if plugins == null then allPlugins else plugins);
 extraArgs = map (x: x.wrapArgs or "") selectedPlugins;
 versionBranch = lib.versions.majorMinor gimp.version;