Merge master into staging-next

2021-05-11 12:24:28 +00:00
parent 10e16ec9ab 5e7fe16211
commit 1e7a48b474
22 changed files with 903 additions and 98 deletions
--- a/pkgs/tools/security/hashcat/default.nix
+++ b/pkgs/tools/security/hashcat/default.nix
@@ -28,7 +28,9 @@ stdenv.mkDerivation rec {

  preFixup = ''
    for f in $out/share/hashcat/OpenCL/*.cl; do
+      # Rewrite files to be included for compilation at runtime for opencl offload
      sed "s|#include \"\(.*\)\"|#include \"$out/share/hashcat/OpenCL/\1\"|g" -i "$f"
+      sed "s|#define COMPARE_\([SM]\) \"\(.*\.cl\)\"|#define COMPARE_\1 \"$out/share/hashcat/OpenCL/\2\"|g" -i "$f"
    done
  '';