diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-11-07 17:16:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-07 17:16:08 -0500 |
| commit | 75a947661e2da6b8f00100a280ce1bfeee4342bf (patch) | |
| tree | 6aa2780fa14e739bd5ea05df5e749fd4443208fa /pkgs | |
| parent | 43bdc3949d6f2c774a0c6f7e478bef585e4c64eb (diff) | |
| parent | 4820d630bf789a9d1aa32694d4d227ab5f324812 (diff) | |
| download | nixlib-75a947661e2da6b8f00100a280ce1bfeee4342bf.tar nixlib-75a947661e2da6b8f00100a280ce1bfeee4342bf.tar.gz nixlib-75a947661e2da6b8f00100a280ce1bfeee4342bf.tar.bz2 nixlib-75a947661e2da6b8f00100a280ce1bfeee4342bf.tar.lz nixlib-75a947661e2da6b8f00100a280ce1bfeee4342bf.tar.xz nixlib-75a947661e2da6b8f00100a280ce1bfeee4342bf.tar.zst nixlib-75a947661e2da6b8f00100a280ce1bfeee4342bf.zip | |
Merge pull request #70395 from davidtwco/khronos-ocl-icd-loader-init
khronos-ocl-icd-loader: init at 6c03f8b
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/khronos-ocl-icd-loader/default.nix | 26 | ||||
| -rw-r--r-- | pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 41 insertions, 0 deletions
diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix new file mode 100644 index 000000000000..a57b103b0d91 --- /dev/null +++ b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, opencl-clhpp, cmake, withTracing ? false }: + +stdenv.mkDerivation rec { + name = "khronos-ocl-icd-loader-${version}"; + version = "6c03f8b"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "OpenCL-ICD-Loader"; + rev = "6c03f8b58fafd9dd693eaac826749a5cfad515f8"; + sha256 = "00icrlc00dpc87prbd2j1350igi9pbgkz27hc3rf73s5994yn86a"; + }; + + patches = stdenv.lib.lists.optional withTracing ./tracing.patch; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ opencl-clhpp ]; + + meta = with stdenv.lib; { + description = "Offical Khronos OpenCL ICD Loader"; + homepage = https://github.com/KhronosGroup/OpenCL-ICD-Loader; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ davidtwco ]; + }; +} diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch b/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch new file mode 100644 index 000000000000..415a1b1dfe49 --- /dev/null +++ b/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch @@ -0,0 +1,13 @@ +diff --git a/loader/icd.h b/loader/icd.h +index a1b6969..cf4e272 100644 +--- a/loader/icd.h ++++ b/loader/icd.h +@@ -122,7 +122,7 @@ void khrIcdContextPropertiesGetPlatform( + cl_platform_id *outPlatform); + + // internal tracing macros +-#if 0 ++#if 1 + #include <stdio.h> + #define KHR_ICD_TRACE(...) \ + do \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d22ff72e98ad..16ba4ce43b98 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9938,6 +9938,8 @@ in kind = callPackage ../development/tools/kind { }; + khronos-ocl-icd-loader = callPackage ../development/libraries/khronos-ocl-icd-loader { }; + kube-aws = callPackage ../development/tools/kube-aws { }; kubectx = callPackage ../development/tools/kubectx { }; |