summary refs log tree commit diff
path: root/pkgs/tools/security/john
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-12-06 10:43:45 -0500
committerMatthew Bauer <mjbauer95@gmail.com>2019-12-06 10:43:45 -0500
commit73cf5d961bcd06d3aa73ab7066cd59049eff8e7f (patch)
treef2232b588f4a3a45b5e40f9e056a64e0dc09359f /pkgs/tools/security/john
parentc87ff3013b6965ec1a6ab3c3ba41d52de7dc50fd (diff)
downloadnixpkgs-73cf5d961bcd06d3aa73ab7066cd59049eff8e7f.tar
nixpkgs-73cf5d961bcd06d3aa73ab7066cd59049eff8e7f.tar.gz
nixpkgs-73cf5d961bcd06d3aa73ab7066cd59049eff8e7f.tar.bz2
nixpkgs-73cf5d961bcd06d3aa73ab7066cd59049eff8e7f.tar.lz
nixpkgs-73cf5d961bcd06d3aa73ab7066cd59049eff8e7f.tar.xz
nixpkgs-73cf5d961bcd06d3aa73ab7066cd59049eff8e7f.tar.zst
nixpkgs-73cf5d961bcd06d3aa73ab7066cd59049eff8e7f.zip
john: use proper configure flags
- need --disable-native-tests not --disable-native-macro
- --with-systemwide is better than -DJOHN_SYSTEMWIDE=1

Fixes #74918
Diffstat (limited to 'pkgs/tools/security/john')
-rw-r--r--pkgs/tools/security/john/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix
index 4107e9fcf14..de02dc1a379 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 \