about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader')
-rw-r--r--nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix14
-rw-r--r--nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch13
2 files changed, 8 insertions, 19 deletions
diff --git a/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
index 37c007db20b4..57fe21a27c7b 100644
--- a/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
+++ b/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
@@ -1,26 +1,28 @@
 { lib, stdenv, fetchFromGitHub, opencl-headers, cmake, withTracing ? false }:
 
 stdenv.mkDerivation rec {
-  pname = "khronos-ocl-icd-loader";
-  version = "2022.01.04";
+  pname = "opencl-icd-loader";
+  version = "2023.12.14";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenCL-ICD-Loader";
     rev = "v${version}";
-    sha256 = "sha256-T2tBoN0yv41W+UksFABVjsetdkXlnEFUINfxumGgC04=";
+    hash = "sha256-/4ixQAwJpygdg+qtR1ccBlz8hmtYYxRgUV5dlJabsg8=";
   };
 
-  patches = lib.optional withTracing ./tracing.patch;
-
   nativeBuildInputs = [ cmake ];
   buildInputs = [ opencl-headers ];
 
+  cmakeFlags = [
+    (lib.cmakeBool "OCL_ICD_ENABLE_TRACE" withTracing)
+  ];
+
   meta = with lib; {
     description = "Official Khronos OpenCL ICD Loader";
     homepage = "https://github.com/KhronosGroup/OpenCL-ICD-Loader";
     license = licenses.asl20;
-    platforms = platforms.linux;
     maintainers = with maintainers; [ davidtwco ];
+    platforms = platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch b/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch
deleted file mode 100644
index cef22457e5a1..000000000000
--- a/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/loader/icd.h b/loader/icd.h
-index 34751e9..01a33fd 100644
---- a/loader/icd.h
-+++ b/loader/icd.h
-@@ -123,7 +123,7 @@ void khrIcdContextPropertiesGetPlatform(
-     cl_platform_id *outPlatform);
- 
- // internal tracing macros
--#if 0
-+#if 1
-     #include <stdio.h>
-     #define KHR_ICD_TRACE(...) \
-     do \