diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2017-12-01 00:00:00 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-02-10 15:07:13 +0000 |
| commit | 63a1c0c80785b4044546fd37227eeb13e3292b8f (patch) | |
| tree | 3096b82a457339a9df4a411a4cd23ef674fe76b0 /pkgs | |
| parent | 67a058eda715f5ab0a2dbf358358d332e686a4c6 (diff) | |
| download | nixpkgs-63a1c0c80785b4044546fd37227eeb13e3292b8f.tar nixpkgs-63a1c0c80785b4044546fd37227eeb13e3292b8f.tar.gz nixpkgs-63a1c0c80785b4044546fd37227eeb13e3292b8f.tar.bz2 nixpkgs-63a1c0c80785b4044546fd37227eeb13e3292b8f.tar.lz nixpkgs-63a1c0c80785b4044546fd37227eeb13e3292b8f.tar.xz nixpkgs-63a1c0c80785b4044546fd37227eeb13e3292b8f.tar.zst nixpkgs-63a1c0c80785b4044546fd37227eeb13e3292b8f.zip | |
ocl-icd: provide a variant for each opencl-headers version
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/ocl-icd/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index 6c3a77cfaf5..9c024862197 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "OpenCL ICD Loader"; + description = "OpenCL ICD Loader for ${opencl-headers.name}"; homepage = https://forge.imag.fr/projects/ocl-icd/; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14fbc33fd79..dfb968c4f8b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10405,7 +10405,10 @@ with pkgs; nvidia-video-sdk = callPackage ../development/libraries/nvidia-video-sdk { }; - ocl-icd = callPackage ../development/libraries/ocl-icd { }; + ocl-icd-oclhGen = oclh: callPackage ../development/libraries/ocl-icd { opencl-headers = oclh; }; + ocl-icd-oclh_1_2 = ocl-icd-oclhGen opencl-headers_1_2; + ocl-icd-oclh_2_2 = ocl-icd-oclhGen opencl-headers_2_2; + ocl-icd = ocl-icd-oclh_2_2; ode = callPackage ../development/libraries/ode { }; |