diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-01-20 12:09:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-20 12:09:17 +0300 |
| commit | d75a3cfb29ab4a4ee88d08312e9117ba3dc8b087 (patch) | |
| tree | 36e26aa9d538f5399f16193243ff0fb27a3987f0 /pkgs/tools | |
| parent | 7f71dd0c495a8bee86944bdc9d7eb39bf43062ce (diff) | |
| parent | 1db8ab66e3d9911ca7f3d7c59e8c31a67bacf3f2 (diff) | |
| download | nixlib-d75a3cfb29ab4a4ee88d08312e9117ba3dc8b087.tar nixlib-d75a3cfb29ab4a4ee88d08312e9117ba3dc8b087.tar.gz nixlib-d75a3cfb29ab4a4ee88d08312e9117ba3dc8b087.tar.bz2 nixlib-d75a3cfb29ab4a4ee88d08312e9117ba3dc8b087.tar.lz nixlib-d75a3cfb29ab4a4ee88d08312e9117ba3dc8b087.tar.xz nixlib-d75a3cfb29ab4a4ee88d08312e9117ba3dc8b087.tar.zst nixlib-d75a3cfb29ab4a4ee88d08312e9117ba3dc8b087.zip | |
Merge pull request #21995 from abbradar/opencl
Fix OpenCL support
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/security/hashcat/hashcat3/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/system/opencl-info/default.nix | 28 |
2 files changed, 30 insertions, 2 deletions
diff --git a/pkgs/tools/security/hashcat/hashcat3/default.nix b/pkgs/tools/security/hashcat/hashcat3/default.nix index ef41b0b2a0ed..810d9df9e2fe 100644 --- a/pkgs/tools/security/hashcat/hashcat3/default.nix +++ b/pkgs/tools/security/hashcat/hashcat3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, opencl-headers, opencl-icd }: +{ stdenv, fetchurl, makeWrapper, opencl-headers, ocl-icd }: assert stdenv.isLinux; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - wrapProgram $out/bin/hashcat --prefix LD_LIBRARY_PATH : ${opencl-icd}/lib + wrapProgram $out/bin/hashcat --prefix LD_LIBRARY_PATH : ${ocl-icd}/lib ''; meta = { diff --git a/pkgs/tools/system/opencl-info/default.nix b/pkgs/tools/system/opencl-info/default.nix new file mode 100644 index 000000000000..b4d9f699b05b --- /dev/null +++ b/pkgs/tools/system/opencl-info/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, opencl-clhpp, ocl-icd }: + +stdenv.mkDerivation { + name = "opencl-info-2014-02-21"; + + src = fetchFromGitHub { + owner = "marchv"; + repo = "opencl-info"; + rev = "3e53d001a98978feb865650cf0e93b045400c0d7"; + sha256 = "114lxgnjg40ivjjszkv4n3f3yq2lbrvywryvbazf20kqmdz7315l"; + }; + + buildInputs = [ opencl-clhpp ocl-icd ]; + + NIX_LDFLAGS = [ "-lOpenCL" ]; + + installPhase = '' + install -Dm755 opencl-info $out/bin/opencl-info + ''; + + meta = with stdenv.lib; { + description = "A tool to dump OpenCL platform/device information"; + homepage = "https://github.com/marchv/opencl-info"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} |