diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-06-08 19:56:13 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2022-06-08 19:56:43 +0100 |
| commit | ac8d9e9e013ebb48d2296d8d1f8654f3109cb4d0 (patch) | |
| tree | 7b084f2c2183ab1891b7280656832fe3e2cf4ee9 /pkgs | |
| parent | 064a605987c0ff66db54b3caa185542c1115dee2 (diff) | |
gimpPlugins.lqrPlugin: pull upstream fix for -fno-common toolchains
Without the change build fails on upstream gcc-10 as:
ld: interface_aux.o:src/interface_aux.c:55: multiple definition of
`dlg'; interface.o:src/interface.c:100: first defined here
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/graphics/gimp/plugins/default.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 79760bb31a650..62875ceac3fa7 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -250,6 +250,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 { |