Merge pull request #72411 from peterhoeg/f/john

john: build with python3
This commit is contained in:
Peter Hoeg 2019-11-03 14:19:16 +08:00 committed by GitHub
commit 4bff595c1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2 { stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2
, gcc, pythonPackages, perl, perlPackages, makeWrapper , gcc, python3Packages, perl, perlPackages, makeWrapper
}: }:
with stdenv.lib; with stdenv.lib;
@ -33,8 +33,9 @@ stdenv.mkDerivation rec {
''; '';
configureFlags = [ "--disable-native-macro" ]; configureFlags = [ "--disable-native-macro" ];
buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 gcc pythonPackages.wrapPython perl makeWrapper ]; buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 ];
propagatedBuildInputs = (with pythonPackages; [ dpkt scapy lxml ]) ++ # For pcap2john.py nativeBuildInputs = [ gcc python3Packages.wrapPython perl makeWrapper ];
propagatedBuildInputs = (with python3Packages; [ dpkt scapy lxml ]) ++ # For pcap2john.py
(with perlPackages; [ DigestMD4 DigestSHA1 GetoptLong # For pass_gen.pl (with perlPackages; [ DigestMD4 DigestSHA1 GetoptLong # For pass_gen.pl
perlldap ]); # For sha-dump.pl perlldap ]); # For sha-dump.pl
# TODO: Get dependencies for radius2john.pl and lion2john-alt.pl # TODO: Get dependencies for radius2john.pl and lion2john-alt.pl