From 29638c4a7ee8efdc764e5f77fd68e03e86926036 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Mar 2023 14:53:51 +0100 Subject: gimp-with-plugins: Use consistent GIMP version In case `gimp` attribute from `gimpPlugins` scope is overridden to something different than the top-level one. --- pkgs/applications/graphics/gimp/wrapper.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs') 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; -- cgit 1.4.1