mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 00:12:56 +00:00
Merge pull request #50523 from kierdavis/hashcat-5.0.0
hashcat: 4.2.1 -> 5.0.0
This commit is contained in:
commit
f6fd7f44c7
@ -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
22
pkgs/tools/security/hashcat/use-installed-xxhash.patch
Normal 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)
|
Loading…
Reference in New Issue
Block a user