From 73cf5d961bcd06d3aa73ab7066cd59049eff8e7f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 6 Dec 2019 10:43:45 -0500 Subject: [PATCH 1/2] john: use proper configure flags - need --disable-native-tests not --disable-native-macro - --with-systemwide is better than -DJOHN_SYSTEMWIDE=1 Fixes #74918 --- pkgs/tools/security/john/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index 4107e9fcf142..de02dc1a3793 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -31,7 +31,10 @@ stdenv.mkDerivation rec { export AS=$CC export LD=$CC ''; - configureFlags = [ "--disable-native-macro" ]; + configureFlags = [ + "--disable-native-tests" + "--with-systemwide" + ]; buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 ]; nativeBuildInputs = [ gcc python3Packages.wrapPython perl makeWrapper ]; @@ -44,8 +47,6 @@ stdenv.mkDerivation rec { # gcc: error: memdbg.o: No such file or directory enableParallelBuilding = false; - NIX_CFLAGS_COMPILE = [ "-DJOHN_SYSTEMWIDE=1" ]; - postInstall = '' mkdir -p "$out/bin" "$out/etc/john" "$out/share/john" "$out/share/doc/john" find -L ../run -mindepth 1 -maxdepth 1 -type f -executable \ From a36c36a87b5fa3174e7304430fa5e19af35c6e0c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 6 Dec 2019 10:47:29 -0500 Subject: [PATCH 2/2] john: update meta - set platforms to unix - add myself as maintainer --- pkgs/tools/security/john/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index de02dc1a3793..841a23814910 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { description = "John the Ripper password cracker"; license = licenses.gpl2; homepage = https://github.com/magnumripper/JohnTheRipper/; - maintainers = with maintainers; [ offline ]; - platforms = [ "x86_64-linux" "x86_64-darwin"]; + maintainers = with maintainers; [ offline matthewbauer ]; + platforms = platforms.unix; }; }