From e2642a5ab210ef69de42eaf4263cb3a54c1b0c5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Aug 2024 23:35:23 +0200 Subject: [PATCH] intel-graphics-compiler: 1.0.17193.4 -> 1.0.17384.11 Changelog: https://github.com/intel/intel-graphics-compiler/releases/tag/igc-1.0.17384.11 --- .../intel-graphics-compiler/default.nix | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index 27cd6acc3f17..ef3ff5ff4565 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, bash , cmake , runCommandLocal , bison @@ -20,8 +21,8 @@ let vc_intrinsics_src = fetchFromGitHub { owner = "intel"; repo = "vc-intrinsics"; - rev = "v0.18.0"; - hash = "sha256-F2GR3TDUUiygEhdQN+PsMT/CIYBATMQX5wkvwrziS2E="; + rev = "v0.19.0"; + hash = "sha256-vOK7xfOR+aDpdGd8oOFLJc1Ct1S5BCJmLN6Ubn5wlkQ="; }; inherit (llvmPackages_14) lld llvm; @@ -31,16 +32,25 @@ in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.17193.4"; + version = "1.0.17384.11"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; rev = "igc-${version}"; - hash = "sha256-OOKj3kfl+0/dgeICFtbiOVE0nsYYvI4v97BLjcExAmc="; + hash = "sha256-O4uMaPauRv2aMgM2B7XdzCcjI5JghsjX5XbkeloLyck="; }; - nativeBuildInputs = [ bison cmake flex (python3.withPackages (ps : with ps; [ mako ])) ]; + postPatch = '' + substituteInPlace IGC/AdaptorOCL/igc-opencl.pc.in \ + --replace-fail '/@CMAKE_INSTALL_INCLUDEDIR@' "/include" \ + --replace-fail '/@CMAKE_INSTALL_LIBDIR@' "/lib" + + chmod +x IGC/Scripts/igc_create_linker_script.sh + patchShebangs --build IGC/Scripts/igc_create_linker_script.sh + ''; + + nativeBuildInputs = [ bash bison cmake flex (python3.withPackages (ps : with ps; [ mako pyyaml ])) ]; buildInputs = [ lld llvm spirv-headers spirv-llvm-translator' spirv-tools ]; @@ -49,12 +59,6 @@ stdenv.mkDerivation rec { # testing is done via intel-compute-runtime doCheck = false; - postPatch = '' - substituteInPlace IGC/AdaptorOCL/igc-opencl.pc.in \ - --replace '/@CMAKE_INSTALL_INCLUDEDIR@' "/include" \ - --replace '/@CMAKE_INSTALL_LIBDIR@' "/lib" - ''; - # Handholding the braindead build script # cmake requires an absolute path prebuilds = runCommandLocal "igc-cclang-prebuilds" { } ''