Merge pull request #171731 from lovesegfault/igm-fixup

intel-graphics-compiler: follow-ups

pkgs/development/compilers/intel-graphics-compiler/default.nix

@@ -54,19 +54,19 @@ stdenv.mkDerivation rec {
   # https://github.com/intel/intel-graphics-compiler/issues/98
   doCheck = false;
 
-  patchPhase = ''
+  postPatch = ''
     substituteInPlace ./external/SPIRV-Tools/CMakeLists.txt \
-            --replace '$'''{SPIRV-Tools_DIR}../../..' \
-                      '${spirv-tools}' \
-            --replace 'SPIRV-Headers_INCLUDE_DIR "/usr/include"' \
-                      'SPIRV-Headers_INCLUDE_DIR "${spirv-headers}/include"' \
-            --replace 'set_target_properties(SPIRV-Tools' \
-                      'set_target_properties(SPIRV-Tools-shared' \
-            --replace 'IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools' \
-                      'IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools-shared'
-          substituteInPlace ./IGC/AdaptorOCL/igc-opencl.pc.in \
-            --replace '/@CMAKE_INSTALL_INCLUDEDIR@' "/include" \
-            --replace '/@CMAKE_INSTALL_LIBDIR@' "/lib"
+      --replace '$'''{SPIRV-Tools_DIR}../../..' \
+                '${spirv-tools}' \
+      --replace 'SPIRV-Headers_INCLUDE_DIR "/usr/include"' \
+                'SPIRV-Headers_INCLUDE_DIR "${spirv-headers}/include"' \
+      --replace 'set_target_properties(SPIRV-Tools' \
+                'set_target_properties(SPIRV-Tools-shared' \
+      --replace 'IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools' \
+                'IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools-shared'
+    substituteInPlace ./IGC/AdaptorOCL/igc-opencl.pc.in \
+      --replace '/@CMAKE_INSTALL_INCLUDEDIR@' "/include" \
+      --replace '/@CMAKE_INSTALL_LIBDIR@' "/lib"
   '';
 
   # Handholding the braindead build script
@@ -84,7 +84,6 @@ stdenv.mkDerivation rec {
     "-Wno-dev"
     "-DVC_INTRINSICS_SRC=${vc_intrinsics_src}"
     "-DIGC_OPTION__SPIRV_TOOLS_MODE=Prebuilds"
-    "-DINSTALL_SPIRVDLL=0"
     "-DCCLANG_BUILD_PREBUILDS=ON"
     "-DCCLANG_BUILD_PREBUILDS_DIR=${prebuilds}"
     "-DIGC_PREFERRED_LLVM_VERSION=${getVersion llvm}"

pkgs/development/compilers/spirv-llvm-translator/default.nix

@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-/vUyL6Wh8hykoGz1QmT1F7lfGDEmG4U3iqmqrJxizOg=";
   };
 
-  nativeBuildInputs = [ pkg-config cmake llvm_11.dev ];
+  nativeBuildInputs = [ pkg-config cmake llvm_11.dev spirv-tools ];
 
-  buildInputs = [ spirv-headers spirv-tools llvm_11 ];
+  buildInputs = [ spirv-headers llvm_11 ];
 
   checkInputs = [ lit ];
 
@@ -34,12 +34,6 @@ stdenv.mkDerivation rec {
     "-DLLVM_SPIRV_BUILD_EXTERNAL=YES"
   ];
 
-  prePatch = ''
-    substituteInPlace ./test/CMakeLists.txt \
-      --replace 'SPIRV-Tools' 'SPIRV-Tools-shared'
-  '';
-
-
   # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist
   doCheck = false;