Unverified Commit 60fb6865 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge pull request #238960 from fpletz/pkgs/nmap-7.94

nmap: 7.93 -> 7.94
parents 920b8334 ddf2d4e8
Loading
Loading
Loading
Loading
+2 −17
Original line number Diff line number Diff line
{ lib, stdenv, fetchurl, fetchpatch, libpcap, pkg-config, openssl, lua5_3
, pcre, libssh2
, libX11 ? null
, gtk2 ? null
, makeWrapper ? null
, withLua ? true
}:

stdenv.mkDerivation rec {
  pname = "nmap";
  version = "7.93";
  version = "7.94";

  src = fetchurl {
    url = "https://nmap.org/dist/nmap-${version}.tar.bz2";
    sha256 = "sha256-Vbz+R5PiWsyWukJ02MQijbVQuOjv1yAEs47FWi3RZlE=";
    sha256 = "sha256-1xvhie7EPX4Jm6yFcVCdMWxFd8p5SRgyrD4SF7yPksw=";
  };

  patches = [ ./zenmap.patch ]
    ++ lib.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.
      # https://github.com/nmap/nmap/pull/1363
      fetchpatch {
        url = "https://github.com/nmap/nmap/commit/5bbe66f1bd8cbd3718f5805139e2e8139e6849bb.diff";
        includes = [ "nping/EchoServer.cc" ];
        sha256 = "0xcph9mycy57yryjg253frxyz87c4135rrbndlqw1400c8jxq70c";
      }
    )];

  prePatch = lib.optionalString stdenv.isDarwin ''
    substituteInPlace libz/configure \
        --replace /usr/bin/libtool ar \
+0 −15
Original line number Diff line number Diff line
diff -ruN nmap-5.50.orig/zenmap/zenmapCore/Paths.py nmap-5.50/zenmap/zenmapCore/Paths.py
--- nmap-5.50.orig/zenmap/zenmapCore/Paths.py	2013-06-06 05:52:10.723087428 +0000
+++ nmap-5.50/zenmap/zenmapCore/Paths.py	2013-06-06 07:07:25.481261761 +0000
@@ -115,7 +115,10 @@
     else:
         # Normal script execution. Look in the current directory to allow
         # running from the distribution.
-        return os.path.abspath(os.path.dirname(fs_dec(sys.argv[0])))
+        #
+        # Grrwlf: No,no,dear. That's not a script, thats Nixos wrapper. Go add
+        # those '..' to substract /bin part.
+        return os.path.abspath(os.path.join(os.path.dirname(fs_dec(sys.argv[0])), ".."))

 prefix = get_prefix()