diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2019-08-24 13:57:35 +0900 |
|---|---|---|
| committer | Andrew Childs <lorne@cons.org.nz> | 2019-08-24 13:57:35 +0900 |
| commit | de1e3c9aee11f35fc35f813add4a6d52e2d1df2b (patch) | |
| tree | a031e41e63e654dd5547387f3cb479e5aebe2938 /pkgs/tools/security | |
| parent | 867163e1f84f815109fefe0837eb52a03227da77 (diff) | |
nmap: update clang specific patch
The upstream PR had two parts: adding a missing include and resolving
an ambiguous reference. The upstream project fixed the first but not
the second. We still need the second part, so extract it by filtering
the patch.
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/nmap/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index bf9c7a4fc461..1b66dab35c8f 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -31,11 +31,11 @@ in stdenv.mkDerivation rec { ++ optionals stdenv.cc.isClang [( # Fixes a compile error due an ambiguous reference to bind(2) in # nping/EchoServer.cc, which is otherwise resolved to std::bind. - # Also fixes a missing include. # https://github.com/nmap/nmap/pull/1363 fetchpatch { url = "https://github.com/nmap/nmap/commit/5bbe66f1bd8cbd3718f5805139e2e8139e6849bb.diff"; - sha256 = "088r8ylpc9hachsxs4r17cqfa1ncyspbjvkc573lill7rk1r9m0s"; + includes = [ "nping/EchoServer.cc" ]; + sha256 = "0xcph9mycy57yryjg253frxyz87c4135rrbndlqw1400c8jxq70c"; } )]; |