From 2d0ea8e6d5524e85f641a0410145b92ce02bac04 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 May 2019 02:43:46 +0200 Subject: [PATCH] =?UTF-8?q?gimpPlugins.resynthesizer2:=202.0.1=20=E2=86=92?= =?UTF-8?q?=202.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes makeFlags: $out is not sufficient to install the binaries, let's use placeholder. Also update and clean up the expression. --- pkgs/applications/graphics/gimp/plugins/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 0c753498af3..714a1f921d6 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -23,7 +23,7 @@ let } // a // { - name = "gimp-plugin-${a.name}"; + name = "gimp-plugin-${a.name or "${a.pname}-${a.version}"}"; buildInputs = [ gimp gimp.gtk glib ] ++ (a.buildInputs or []); nativeBuildInputs = [ pkgconfig intltool ] ++ (a.nativeBuildInputs or []); } @@ -110,22 +110,23 @@ rec { "; }; - resynthesizer2 = pluginDerivation { + resynthesizer2 = pluginDerivation rec { /* menu: Filters/Map/Resynthesize Filters/Enhance/Smart enlarge Filters/Enhance/Smart sharpen Filters/Enhance/Smart remove selection */ - name = "resynthesizer-2.0.1"; + pname = "resynthesizer"; + version = "2.0.3"; buildInputs = with pkgs; [ fftw ]; nativeBuildInputs = with pkgs; [ autoreconfHook ]; - makeFlags = "GIMP_LIBDIR=$out/lib/gimp/2.0/"; + makeFlags = [ "GIMP_LIBDIR=${placeholder "out"}/lib/gimp/2.0" ]; src = fetchFromGitHub { owner = "bootchk"; repo = "resynthesizer"; - rev = "2.0.1"; - sha256 = "1d214s0jsqxz83l9dd8vhnz3siw9fyw7xdhhir25ra7jiwxc99hd"; + rev = "v${version}"; + sha256 = "1jwc8bhhm21xhrgw56nzbma6fwg59gc8anlmyns7jdiw83y0zx3j"; }; };