From eb38504a7483d93f48b28451f99981e1811c8cf2 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 5 Jun 2022 20:55:54 +0100 Subject: [PATCH] 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 --- pkgs/tools/security/yersinia/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/security/yersinia/default.nix b/pkgs/tools/security/yersinia/default.nix index 390ed880ca1..4a12d679d3c 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 ];