about summary refs log tree commit diff
path: root/pkgs/tools/security/yersinia
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2022-06-05 20:55:54 +0100
committerSergei Trofimovich <slyich@gmail.com>2022-06-06 09:19:57 +0100
commiteb38504a7483d93f48b28451f99981e1811c8cf2 (patch)
tree6420479393ece5bcc14a3ebb4e0ac8fc971c07cc /pkgs/tools/security/yersinia
parenta43da8cc8b1f2ed2849f14b8f8f18f813883b7e3 (diff)
yersinia: add -fcommon workaround
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:

    ld: ncurses-interface.o:src/ncurses-interface.h:83: multiple definition of
      `pointer'; ncurses-gui.o:src/ncurses-interface.h:83: first defined here
Diffstat (limited to 'pkgs/tools/security/yersinia')
-rw-r--r--pkgs/tools/security/yersinia/default.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/tools/security/yersinia/default.nix b/pkgs/tools/security/yersinia/default.nix
index 390ed880ca1e2..4a12d679d3c71 100644
--- a/pkgs/tools/security/yersinia/default.nix
+++ b/pkgs/tools/security/yersinia/default.nix
@@ -24,6 +24,14 @@ stdenv.mkDerivation rec {
       url = "https://github.com/tomac/yersinia/commit/d91bbf6f475e7ea39f131b77ce91b2de9646d5ca.patch";
       sha256 = "fl1pZKWA+nLtBm9+3FBFqaeuVZjszQCNkNl6Cf++BAI=";
     })
+
+    # Pull upstream fix for -fno-common toolchain support:
+    #   https://github.com/tomac/yersinia/pull/66
+    (fetchpatch {
+      name = "fno-common.patch";
+      url = "https://github.com/tomac/yersinia/commit/36247225dc7a6f38c4ba70537e20351f04762749.patch";
+      sha256 = "KHaN8gfgNROEico27gWnYiP9ZVhpWz0KjFYy2t5tPBo=";
+    })
   ];
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];