Unverified Commit 1b01f5db authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #201063 from ziguana/level_zero

parents d45949a1 0d09e743

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -16018,4 +16018,10 @@ 
    github = "wuyoli";

    githubId = 104238274;

  };

  ziguana = {

    name = "Zig Uana";

    email = "git@ziguana.dev";

    github = "ziguana";

    githubId = 45833444;

  };

}

pkgs/development/libraries/level-zero/default.nix

0 → 100644
+27 −0
Original line number Diff line number Diff line 
{ 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 ];

  };

}

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

+7 −1
Original line number Diff line number Diff line
@@ -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 = ''

pkgs/top-level/all-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -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 { };