diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2eb61cd697db..51fa21323a29 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16018,4 +16018,10 @@ github = "wuyoli"; githubId = 104238274; }; + ziguana = { + name = "Zig Uana"; + email = "git@ziguana.dev"; + github = "ziguana"; + githubId = 45833444; + }; } diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/development/libraries/level-zero/default.nix new file mode 100644 index 000000000000..592260c0a467 --- /dev/null +++ b/pkgs/development/libraries/level-zero/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, addOpenGLRunpath, cmake }: + +stdenv.mkDerivation rec { + pname = "level-zero"; + version = "1.8.8"; + + src = fetchFromGitHub { + owner = "oneapi-src"; + repo = "level-zero"; + rev = "v${version}"; + sha256 = "sha256-hfbTgEbvrhWkZEi8Km7KaxJBAc9X1kA/T2DLooKa7KQ="; + }; + + nativeBuildInputs = [ cmake addOpenGLRunpath ]; + + postFixup = '' + addOpenGLRunpath $out/lib/libze_loader.so + ''; + + meta = with lib; { + homepage = "https://www.oneapi.io/"; + description = "oneAPI Level Zero Specification Headers and Loader"; + license = licenses.mit; + maintainers = [ maintainers.ziguana ]; + }; +} + 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index baba81c336ab..5f7e3a7f6002 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25261,6 +25261,8 @@ with pkgs; intel-ocl = callPackage ../os-specific/linux/intel-ocl { }; + level-zero = callPackage ../development/libraries/level-zero { }; + iomelt = callPackage ../os-specific/linux/iomelt { }; iotop = callPackage ../os-specific/linux/iotop { };