Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8920d1efb139
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 38323015e201
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 21, 2018

  1. masscan: fix build

    @LnL7
    LnL7 committed Mar 21, 2018
    Copy the full SHA
    3832301 View commit details
Showing with 9 additions and 3 deletions.
  1. +6 −2 pkgs/tools/security/masscan/default.nix
  2. +3 −1 pkgs/top-level/all-packages.nix
8 changes: 6 additions & 2 deletions pkgs/tools/security/masscan/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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 { };