JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #50523 from kierdavis/hashcat-5.0.0

Browse Source 
hashcat: 4.2.1 -> 5.0.0
This commit is contained in:
Jörg Thalheim 2018-11-18 12:11:58 +00:00 committed by GitHub
commit f6fd7f44c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/security/hashcat/default.nix
View File

@ -1,16 +1,17 @@
{ stdenv, fetchurl, makeWrapper, opencl-headers, ocl-icd }:
{ stdenv, fetchurl, makeWrapper, opencl-headers, ocl-icd, xxHash }:
stdenv.mkDerivation rec {
name = "hashcat-${version}";
version = "4.2.1";
version = "5.0.0";
src = fetchurl {
url = "https://hashcat.net/files/hashcat-${version}.tar.gz";
sha256 = "082k5srjwkfvnvz0bfcg5r12m9c2qjyfhnp135mparkf831p7bbx";
sha256 = "13xh1lmzdppvx8wr8blqhdr8vpa24j099kz2xzb9pcnqy26dk4kh";
};
patches = [ ./use-installed-xxhash.patch ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ opencl-headers ];
buildInputs = [ opencl-headers xxHash ];
makeFlags = [
"OPENCL_HEADERS_KHRONOS=${opencl-headers}/include"

22
pkgs/tools/security/hashcat/use-installed-xxhash.patch Normal file
View File

@ -0,0 +1,22 @@
diff --git a/src/Makefile b/src/Makefile
index 3a1cd680..576353fe 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -189,7 +189,7 @@ endif
# brain and xxHash
ifeq ($(ENABLE_BRAIN),1)
CFLAGS += -DWITH_BRAIN
-CFLAGS += -Ideps/git/xxHash
+LFLAGS += -lxxhash
endif
##
@@ -313,7 +313,7 @@ WIN_32_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).WIN.32.o)
WIN_64_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).WIN.64.o)
ifeq ($(ENABLE_BRAIN),1)
-OBJS_XXHASH := xxhash
+OBJS_XXHASH :=
NATIVE_STATIC_OBJS += $(foreach OBJ,$(OBJS_XXHASH),obj/$(OBJ).NATIVE.STATIC.o)
NATIVE_SHARED_OBJS += $(foreach OBJ,$(OBJS_XXHASH),obj/$(OBJ).NATIVE.SHARED.o)