diff options
Diffstat (limited to 'pkgs/applications/graphics/gimp/plugins/default.nix')
| -rw-r--r-- | pkgs/applications/graphics/gimp/plugins/default.nix | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 79760bb31a650..ae44b47643cd6 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -229,6 +229,10 @@ in Filters/Enhance/Wavelet sharpen */ name = "wavelet-sharpen-0.1.2"; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: interface.o:(.bss+0xe0): multiple definition of `fimg'; plugin.o:(.bss+0x40): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; NIX_LDFLAGS = "-lm"; src = fetchurl { url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz"; @@ -250,6 +254,15 @@ in rev = "v${version}"; sha256 = "81ajdZ2zQi/THxnBlSeT36tVTEzrS1YqLGpHMhFTKAo="; }; + patches = [ + # Pull upstream fix for -fno-common toolchain support: + # https://github.com/carlobaldassi/gimp-lqr-plugin/pull/6 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/carlobaldassi/gimp-lqr-plugin/commit/ae3464a82e1395fc577cc94999bdc7c4a7bb35f1.patch"; + sha256 = "EdjZWM6U1bhUmsOnLA8iJ4SFKuAXHIfNPzxZqel+JrY="; + }) + ]; }; gmic = pkgs.gmic-qt.override { |