diff options
| author | Daniël de Kok <me@danieldk.eu> | 2020-08-20 20:09:11 +0200 |
|---|---|---|
| committer | Daniël de Kok <me@danieldk.eu> | 2020-08-26 08:06:29 +0200 |
| commit | e71aaab72a3bcf72691fddd62f04703e5a307b68 (patch) | |
| tree | eb1a8f24bd9f3ba6461347d73eb0852307f77be8 /pkgs/os-specific/linux/intel-compute-runtime | |
| parent | 25d7d4752f76b07dbdb14cd6c3e1a11decd1be11 (diff) | |
| download | nixpkgs-e71aaab72a3bcf72691fddd62f04703e5a307b68.tar nixpkgs-e71aaab72a3bcf72691fddd62f04703e5a307b68.tar.gz nixpkgs-e71aaab72a3bcf72691fddd62f04703e5a307b68.tar.bz2 nixpkgs-e71aaab72a3bcf72691fddd62f04703e5a307b68.tar.lz nixpkgs-e71aaab72a3bcf72691fddd62f04703e5a307b68.tar.xz nixpkgs-e71aaab72a3bcf72691fddd62f04703e5a307b68.tar.zst nixpkgs-e71aaab72a3bcf72691fddd62f04703e5a307b68.zip | |
intel-compute-runtime: 20.02.15268 -> 20.33.17675
Diffstat (limited to 'pkgs/os-specific/linux/intel-compute-runtime')
| -rw-r--r-- | pkgs/os-specific/linux/intel-compute-runtime/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/intel-compute-runtime/etc-dir.patch | 15 |
2 files changed, 3 insertions, 21 deletions
diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 5a3a5bf7a4d..bba3549daf6 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -11,18 +11,15 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "20.02.15268"; + version = "20.33.17675"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - sha256 = "138gi92w85bn6haw5x38k39pgiyvvzfhiwpvz6hqlx2j03n8cs2k"; + sha256 = "1ckzspf05skdrjh947gv96finxbv5dpgc84hppm5pdsp5q70iyxp"; }; - # Build script tries to write the ICD to /etc - patches = [ ./etc-dir.patch ]; - nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ intel-gmmlib intel-graphics-compiler libva ]; @@ -31,7 +28,7 @@ stdenv.mkDerivation rec { "-DSKIP_UNIT_TESTS=1" "-DIGC_DIR=${intel-graphics-compiler}" - "-DETC_DIR=${placeholder "out"}/etc" + "-DOCL_ICD_VENDORDIR=${placeholder "out"}/etc/OpenCL/vendors" # The install script assumes this path is relative to CMAKE_INSTALL_PREFIX "-DCMAKE_INSTALL_LIBDIR=lib" diff --git a/pkgs/os-specific/linux/intel-compute-runtime/etc-dir.patch b/pkgs/os-specific/linux/intel-compute-runtime/etc-dir.patch deleted file mode 100644 index d9a80ffa6f9..00000000000 --- a/pkgs/os-specific/linux/intel-compute-runtime/etc-dir.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/package.cmake b/package.cmake -index 24960d5..e9a21e7 100644 ---- a/package.cmake -+++ b/package.cmake -@@ -24,7 +24,9 @@ if(UNIX) - - get_os_release_info(os_name os_version) - -- if("${os_name}" STREQUAL "clear-linux-os") -+ if(DEFINED ETC_DIR) -+ set(_dir_etc ${ETC_DIR}) -+ elseif("${os_name}" STREQUAL "clear-linux-os") - # clear-linux-os distribution avoids /etc for distribution defaults. - set(_dir_etc "/usr/share/defaults/etc") - else() |