JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #95868 from danieldk/icr-update

Browse Source 
intel-compute-runtime: 20.02.15268 -> 20.32.17625
This commit is contained in:
Daniël de Kok 2020-08-26 10:59:41 +02:00 committed by GitHub
commit 7b46d0e777
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/intel-gmmlib/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "intel-gmmlib";
version = "20.2.3";
version = "20.2.5";
src = fetchFromGitHub {
owner = "intel";
repo = "gmmlib";
rev = "${pname}-${version}";
sha256 = "1gsjcsad70pxafhw0jhxdrnfqwv8ffp5sawbgylvc009jlzxh5l8";
sha256 = "0jg3kc74iqmbclx77a6dp4h85va8wi210x4zf5jypiq35c57r8hh";
};
nativeBuildInputs = [ cmake ];

9
pkgs/os-specific/linux/intel-compute-runtime/default.nix
View File

@ -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"

15
pkgs/os-specific/linux/intel-compute-runtime/etc-dir.patch
View File

@ -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()