about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2022-06-15 06:51:34 +0000
committerGitHub <noreply@github.com>2022-06-15 06:51:34 +0000
commitfc3a4daf19723e631d3421024381ddbde914fa46 (patch)
treeaca3e97c2bacf5ee4bfc1fe79718e4581bd115bd /pkgs
parente1a75c484198e85b15531ac4fcb2854de79d8577 (diff)
parentac8d9e9e013ebb48d2296d8d1f8654f3109cb4d0 (diff)
Merge pull request #176939 from trofi/fix-fno-common-for-gimpPlugins.lqrPlugin
gimpPlugins.lqrPlugin: pull upstream fix for -fno-common toolchains
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/graphics/gimp/plugins/default.nix9
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 {