From d5656873d7b0d5bc52794b3d2c403835426ebd5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 21 May 2016 22:05:41 +0200 Subject: [PATCH] john: use gcc 4.9 instead of 5 (unbreaks build) Fixes this build error: dynamic_fmt.o: In function `DynamicFunc__crypt_md5_to_input_raw_Overwrite_NoLen': .../john-1.8.0-jumbo-1/src/dynamic_fmt.c:4989: undefined reference to `MD5_body_for_thread' Upstream issue: https://github.com/magnumripper/JohnTheRipper/issues/1093 --- pkgs/tools/security/john/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index 2e99208fe114..d428d67fdc9f 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2 -, writeText +, writeText, gcc }: with stdenv.lib; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { preConfigure = "cd src"; configureFlags = [ "--disable-native-macro" ]; - buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 ]; + buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 gcc ]; enableParallelBuilding = true; NIX_CFLAGS_COMPILE = [ "-DJOHN_SYSTEMWIDE=1" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04e59c557c33..e6c488660f56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2101,7 +2101,9 @@ in jnettop = callPackage ../tools/networking/jnettop { }; - john = callPackage ../tools/security/john { }; + john = callPackage ../tools/security/john { + gcc = gcc49; # doesn't build with gcc5 + }; jp2a = callPackage ../applications/misc/jp2a { };