Merge pull request #173019 from trofi/fix-fno-common-for-fwknop

fwknop: pull patch pending upstream inclusion for -fno-common support
2022-05-15 23:27:10 +02:00
parent af49adccd7 fd2826353b
commit abaa8ae3bb
1 changed files with 11 additions and 1 deletions
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook
+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook
 , libpcap, texinfo
 , iptables
 , gnupgSupport ? true, gnupg, gpgme # Increases dependencies!
@@ -17,6 +17,16 @@ stdenv.mkDerivation rec {
    sha256 = "05kvqhmxj9p2y835w75f3jvhr38bb96cd58mvfd7xil9dhmhn9ra";
  };

+  patches = [
+    # Pull patch pending upstream inclusion for -fno-common tollchains:
+    #   https://github.com/mrash/fwknop/pull/319
+    (fetchpatch {
+      name = "fno-common.patch";
+      url = "https://github.com/mrash/fwknop/commit/a8214fd58bc46d23b64b3a55db023c7f5a5ea6af.patch";
+      sha256 = "0cp1350q66n455hpd3rdydb9anx66bcirza5gyyyy5232zgg58bi";
+    })
+  ];
+
  nativeBuildInputs = [ autoreconfHook ];
  buildInputs = [ libpcap texinfo ]
    ++ lib.optionals gnupgSupport [ gnupg gpgme.dev ]