diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-12-03 06:01:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-03 06:01:28 +0000 |
| commit | 7ec41836730f4344e835c1ca06e33d347ff017a6 (patch) | |
| tree | c348463f3dbaccc3397afa473ddbb83b7e3d9f16 /pkgs/os-specific | |
| parent | a83c4dd1939293da6ba883d98764c9dc5f14ef74 (diff) | |
| parent | 809f15f2e7fd66c3d3ba6aabffa946fbd67f93fc (diff) | |
| download | nixlib-7ec41836730f4344e835c1ca06e33d347ff017a6.tar nixlib-7ec41836730f4344e835c1ca06e33d347ff017a6.tar.gz nixlib-7ec41836730f4344e835c1ca06e33d347ff017a6.tar.bz2 nixlib-7ec41836730f4344e835c1ca06e33d347ff017a6.tar.lz nixlib-7ec41836730f4344e835c1ca06e33d347ff017a6.tar.xz nixlib-7ec41836730f4344e835c1ca06e33d347ff017a6.tar.zst nixlib-7ec41836730f4344e835c1ca06e33d347ff017a6.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/intel-compute-runtime/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 10 |
2 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 8ea51a1ebdb0..d97dbf0eb262 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -6,6 +6,7 @@ , pkg-config , intel-gmmlib , intel-graphics-compiler +, level-zero , libva }: @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ intel-gmmlib intel-graphics-compiler libva ]; + buildInputs = [ intel-gmmlib intel-graphics-compiler libva level-zero ]; cmakeFlags = [ "-DSKIP_UNIT_TESTS=1" @@ -32,9 +33,14 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_LIBDIR=lib" ]; + outputs = [ "out" "drivers" ]; + postInstall = '' # Avoid clash with intel-ocl mv $out/etc/OpenCL/vendors/intel.icd $out/etc/OpenCL/vendors/intel-neo.icd + + mkdir -p $drivers/lib + mv -t $drivers/lib $out/lib/libze_intel* ''; postFixup = '' diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 19ddbf47bc92..769ea7e369d9 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -27,11 +27,11 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest; production = generic { - version = "515.86.01"; - sha256_64bit = "sha256-FBd34covEel9jTMmAhPxvjJ+tzkiriL03atAS7LvRmQ="; - openSha256 = "sha256-9QVq6eN+usbzMb0hYvAFPlyr6MDYHvgWPz2orm+5QFc="; - settingsSha256 = "sha256-I8CE4EywZrsqzEy7plEG3bNfzTiT+vZJ1sqEQBrtLUQ="; - persistencedSha256 = "sha256-vjn315k7i16U1NjY3EB0pw6sLddEcnKaT9CrHOCY268="; + version = "525.60.11"; + sha256_64bit = "sha256-gW7mwuCBPMw9SnlY9x/EmjfGDv4dUdYUbBznJAOYPV0="; + openSha256 = "sha256-33ATZuYu+SOOxM6UKXp6J+f1+zbmHvaK4v13X3UZTTM="; + settingsSha256 = "sha256-gA1x6oEpnkr/OPP4eR1L5gC5srvEKtDrSpnv2QEaEpE="; + persistencedSha256 = "sha256-AFMy3agoJ6yVsGgUvTfOzHlz30iApBpAReckq9iS7AA="; }; latest = selectHighestVersion production (generic { |