diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2022-05-08 10:29:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-08 10:29:55 +0100 |
| commit | 70c4d6069b8c27a3e49578c1749e81ccc2867f85 (patch) | |
| tree | c379e97555dd6fc56f64071688139399affa13bf /pkgs/tools/security | |
| parent | bed43198ff247d8d86224e5afad160b8a316ab4f (diff) | |
| parent | 83cfaa762b1881ba4b190f799af9d3f2c4e81641 (diff) | |
Merge pull request #172045 from trofi/fix-fno-common-for-ncrack
ncrack: pull upstream fix for fno-common toolchains
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/ncrack/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/tools/security/ncrack/default.nix b/pkgs/tools/security/ncrack/default.nix index e1504eb12b4cc..9e9aeaa409d42 100644 --- a/pkgs/tools/security/ncrack/default.nix +++ b/pkgs/tools/security/ncrack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, openssl, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, openssl, zlib }: stdenv.mkDerivation rec { pname = "ncrack"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "1gnv5xdd7n04glcpy7q1mkb6f8gdhdrhlrh8z6k4g2pjdhxlz26g"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains like upstream gcc-10: + # https://github.com/nmap/ncrack/pull/83 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/nmap/ncrack/commit/cc4103267bab6017a4da9d41156d0c1075012eba.patch"; + sha256 = "06nlfvc7p108f8ppbcgwmj4iwmjy95xhc1sawa8c78lrx22r7gy3"; + }) + ]; + buildInputs = [ openssl zlib ]; meta = with lib; { |