diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-04-27 21:04:56 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-04-27 21:04:56 +0000 |
| commit | a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e (patch) | |
| tree | 47950e79183035018882419c4eff5047d1537b99 /nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader | |
| parent | 5b00523fb58512232b819a301c4309f579c7f09c (diff) | |
| parent | 22a3bf9fb9edad917fb6cd1066d58b5e426ee975 (diff) | |
| download | nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.gz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.bz2 nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.lz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.xz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.zst nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.zip | |
Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix | 12 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch | 6 |
2 files changed, 9 insertions, 9 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 a57b103b0d91..3704cbb7794c 100644 --- a/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix +++ b/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchFromGitHub, opencl-clhpp, cmake, withTracing ? false }: +{ stdenv, fetchFromGitHub, opencl-headers, cmake, withTracing ? false }: stdenv.mkDerivation rec { name = "khronos-ocl-icd-loader-${version}"; - version = "6c03f8b"; + version = "2020.03.13"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-ICD-Loader"; - rev = "6c03f8b58fafd9dd693eaac826749a5cfad515f8"; - sha256 = "00icrlc00dpc87prbd2j1350igi9pbgkz27hc3rf73s5994yn86a"; + rev = "v${version}"; + sha256 = "0zk6fyfrklx8a848613rfcx0y4yn0dsxkxzzl9pgdh9i6qdfjj9k"; }; patches = stdenv.lib.lists.optional withTracing ./tracing.patch; nativeBuildInputs = [ cmake ]; - buildInputs = [ opencl-clhpp ]; + buildInputs = [ opencl-headers ]; meta = with stdenv.lib; { description = "Offical Khronos OpenCL ICD Loader"; - homepage = https://github.com/KhronosGroup/OpenCL-ICD-Loader; + homepage = "https://github.com/KhronosGroup/OpenCL-ICD-Loader"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ davidtwco ]; diff --git a/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch b/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch index 415a1b1dfe49..cef22457e5a1 100644 --- a/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch +++ b/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch @@ -1,10 +1,10 @@ diff --git a/loader/icd.h b/loader/icd.h -index a1b6969..cf4e272 100644 +index 34751e9..01a33fd 100644 --- a/loader/icd.h +++ b/loader/icd.h -@@ -122,7 +122,7 @@ void khrIcdContextPropertiesGetPlatform( +@@ -123,7 +123,7 @@ void khrIcdContextPropertiesGetPlatform( cl_platform_id *outPlatform); - + // internal tracing macros -#if 0 +#if 1 |