diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2019-05-20 21:58:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-20 21:58:19 -0500 |
| commit | f9bda36188026f9ef273c341bf2795b835eab340 (patch) | |
| tree | 947572b7a12f242264f7a3e0b2903a104b45c939 /pkgs/tools/security | |
| parent | 022d8ab861cea9508f407ffe906c713b2b1ee529 (diff) | |
| parent | 652045176c7babafdb488aa966ae30c5b02987e5 (diff) | |
Merge pull request #61733 from thefloweringash/nmap-new-stdenv
nmap: fix build with new Darwin stdenv
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/nmap/default.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index bd5930909659..3bc5758aad44 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap, pkgconfig, openssl, lua5_3 +{ stdenv, fetchurl, fetchpatch, libpcap, pkgconfig, openssl, lua5_3 , graphicalSupport ? false , libX11 ? null , gtk2 ? null @@ -27,7 +27,17 @@ in stdenv.mkDerivation rec { sha256 = "063fg8adx23l4irrh5kn57hsmi1xvjkar4vm4k6g94ppan4hcyw4"; }; - patches = ./zenmap.patch; + patches = [ ./zenmap.patch ] + ++ 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"; + } + )]; prePatch = optionalString stdenv.isDarwin '' substituteInPlace libz/configure \ |