From 38323015e2011ee2ed9af0a516b5f2c804627d5f Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 21 Mar 2018 21:42:06 +0100 Subject: [PATCH] masscan: fix build --- pkgs/tools/security/masscan/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix index 22a452ccabdd..26497659d23d 100644 --- a/pkgs/tools/security/masscan/default.nix +++ b/pkgs/tools/security/masscan/default.nix @@ -11,9 +11,13 @@ stdenv.mkDerivation rec { sha256 = "0mjvwh4i0ncsa3ywavw2s55v5bfv7pyga028c8m8xfash9764wwf"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; - makeFlags = [ "PREFIX=$(out)" "CC=cc" "-j" ]; + makeFlags = [ "PREFIX=$(out)" "GITVER=${version}" "CC=cc" ]; + + preInstall = '' + mkdir -p $out/bin + ''; postInstall = '' mkdir -p $out/share/man/man8 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b04ff0f3683..0bdff7935bc2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1298,7 +1298,9 @@ with pkgs; mathics = pythonPackages.mathics; - masscan = callPackage ../tools/security/masscan { }; + masscan = callPackage ../tools/security/masscan { + stdenv = gccStdenv; + }; massren = callPackage ../tools/misc/massren { };