JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
fwknop: pull patch pending upstream inclusion for -fno-common support
This commit is contained in:
Rick van Schijndel 2022-05-15 23:27:10 +02:00 committed by GitHub
commit abaa8ae3bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/security/fwknop/default.nix
View File

@ -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 ]