From e74e2e838d9fb331fb8e93daebb5b520e4d7a4f4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 12 May 2019 14:31:19 +0200 Subject: [PATCH 1/4] gimpPlugins.resynthesizer: drop It breaks resynthesiser2 and there is actually no reason to keep the ancient version. https://github.com/bootchk/resynthesizer/issues/63#issuecomment-491591082 --- .../graphics/gimp/plugins/default.nix | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 714a1f921d62..16b6a0ccd8c1 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -90,26 +90,6 @@ rec { meta.broken = true; }; - resynthesizer = pluginDerivation { - /* menu: - Filters/Map/Resynthesize - Filters/Enhance/Smart enlarge - Filters/Enhance/Smart sharpen - Filters/Enhance/Smart remove selection - */ - name = "resynthesizer-0.16"; - buildInputs = with pkgs; [ fftw ]; - src = fetchurl { - url = http://www.logarithmic.net/pfh-files/resynthesizer/resynthesizer-0.16.tar.gz; - sha256 = "1k90a1jzswxmajn56rdxa4r60v9v34fmqsiwfdxqcvx3yf4yq96x"; - }; - - installPhase = " - installPlugins resynth - installScripts smart-{enlarge,remove}.scm - "; - }; - resynthesizer2 = pluginDerivation rec { /* menu: Filters/Map/Resynthesize From d5dfc1cd8b3158548f8ffcc050d37f22d85fe39d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 12 May 2019 14:40:30 +0200 Subject: [PATCH 2/4] gimpPlugins: use makeScope --- pkgs/applications/graphics/gimp/plugins/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 16b6a0ccd8c1..ac68e3776961 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -35,7 +35,8 @@ let }; in -rec { + +stdenv.lib.makeScope pkgs.newScope (self: with self; { gap = pluginDerivation { /* menu: Video @@ -223,4 +224,4 @@ rec { }; */ -} +}) From 2d68295beac21fd974948a7ce1c1f6bd20f39ff7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 12 May 2019 14:41:35 +0200 Subject: [PATCH 3/4] gimpPlugins.resynthesizer: rename from resynthesizer2 --- pkgs/applications/graphics/gimp/plugins/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index ac68e3776961..f090ad30ae4f 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -3,7 +3,7 @@ # preferences -> Folders -> Plug-ins # same applies for the scripts -{ pkgs, gimp }: +{ config, pkgs, gimp }: let inherit (pkgs) stdenv fetchurl pkgconfig intltool glib fetchFromGitHub; inherit (gimp) targetPluginDir targetScriptDir; @@ -91,7 +91,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { meta.broken = true; }; - resynthesizer2 = pluginDerivation rec { + resynthesizer = pluginDerivation rec { /* menu: Filters/Map/Resynthesize Filters/Enhance/Smart enlarge @@ -224,4 +224,8 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { }; */ +} // stdenv.lib.optionalAttrs (config.allowAliases or true) { + + resynthesizer2 = resynthesizer; + }) From 0fe311844e1c9975e2349098ebf68a973daeb107 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 12 May 2019 14:58:16 +0200 Subject: [PATCH 4/4] gimpPlugins.resynthesizer: update menu comment --- pkgs/applications/graphics/gimp/plugins/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index f090ad30ae4f..1787b1d9e7fc 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -93,10 +93,13 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { resynthesizer = pluginDerivation rec { /* menu: - Filters/Map/Resynthesize - Filters/Enhance/Smart enlarge - Filters/Enhance/Smart sharpen - Filters/Enhance/Smart remove selection + Edit/Fill with pattern seamless... + Filters/Enhance/Heal selection... + Filters/Enhance/Heal transparency... + Filters/Enhance/Sharpen by synthesis... + Filters/Enhance/Uncrop... + Filters/Map/Style... + Filters/Render/Texture... */ pname = "resynthesizer"; version = "2.0.3";