about summary refs log tree commit diff
path: root/pkgs/applications/science/biology/kssd
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2022-05-21 11:22:53 +0100
committerSergei Trofimovich <slyich@gmail.com>2022-05-21 11:22:53 +0100
commiteb0590ec3dfd6f0c2f35e936e3b3ac4367e771a5 (patch)
treec461925f91987dbbf65145b982d6b714d25b2c17 /pkgs/applications/science/biology/kssd
parent25e4e7af034950c2d0f408b4b12b362968572ac2 (diff)
kssd: pull upstream fix for -fno-common tollchains
Without the change build fails on upstream gcc-10 as:

    ld: ccD2iWhk.o:(.bss+0x8): multiple definition of `domain';
      ccgA4lYl.o:(.bss+0x8): first defined here
    ld: ccD2iWhk.o:(.bss+0x0): multiple definition of `long_domain';
      ccgA4lYl.o:(.bss+0x0): first defined here
Diffstat (limited to 'pkgs/applications/science/biology/kssd')
-rw-r--r--pkgs/applications/science/biology/kssd/default.nix12
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/applications/science/biology/kssd/default.nix b/pkgs/applications/science/biology/kssd/default.nix
index 2da7f627cb404..34d997252f5bb 100644
--- a/pkgs/applications/science/biology/kssd/default.nix
+++ b/pkgs/applications/science/biology/kssd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, zlib, automake, autoconf, libtool }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, automake, autoconf, libtool }:
 
 stdenv.mkDerivation rec {
   pname = "kssd";
@@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-8jzYqo9LXF66pQ1EIusm+gba2VbTYpJz2K3NVlA3QxY=";
   };
 
+  patches = [
+    # Pull upstream patch for -fno-common toolchain support:
+    #   https://github.com/yhg926/public_kssd/pull/9
+    (fetchpatch {
+      name = "fno-common.patch";
+      url = "https://github.com/yhg926/public_kssd/commit/cdd1e8aae256146f5913a3b4c723b638d53bdf27.patch";
+      sha256 = "sha256-HhaTRqPfKR+ouh0PwEH6u22pbuqbX2OypRzw8BXm0W4=";
+    })
+  ];
+
   nativeBuildInputs = [ autoconf automake ];
   buildInputs = [ zlib libtool ];