diff --git a/pkgs/by-name/in/intel-llvm/gnu-install-dirs.patch b/pkgs/by-name/in/intel-llvm/gnu-install-dirs.patch
index 9cbf85248120..0d2d520b911e 100644
--- a/pkgs/by-name/in/intel-llvm/gnu-install-dirs.patch
+++ b/pkgs/by-name/in/intel-llvm/gnu-install-dirs.patch
@@ -68,35 +68,35 @@ index 4059fc3e986c..2b2500ad655c 100644
  
          if (NOT LLVM_ENABLE_IDE)
 diff --git a/clang/tools/scan-build-py/CMakeLists.txt b/clang/tools/scan-build-py/CMakeLists.txt
-index 9273eb5ed977..8251d75bc52e 100644
+index 84087a9fd8d2..2d9bb08c5438 100644
 --- a/clang/tools/scan-build-py/CMakeLists.txt
 +++ b/clang/tools/scan-build-py/CMakeLists.txt
-@@ -88,7 +88,7 @@ foreach(lib ${LibScanbuild})
-                      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib})
-   list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib})
-   install(FILES lib/libscanbuild/${lib}
--          DESTINATION lib/libscanbuild
-+          DESTINATION ${CMAKE_INSTALL_LIBDIR}/libscanbuild
-           COMPONENT scan-build-py)
- endforeach()
+@@ -91,7 +91,7 @@ if(CLANG_INSTALL_SCANBUILDPY)
+                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib})
+     list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib})
+     install(FILES lib/libscanbuild/${lib}
+-            DESTINATION lib/libscanbuild
++            DESTINATION ${CMAKE_INSTALL_LIBDIR}/libscanbuild
+             COMPONENT scan-build-py)
+   endforeach()
  
-@@ -106,7 +106,7 @@ foreach(resource ${LibScanbuildResources})
-                      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource})
-   list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource})
-   install(FILES lib/libscanbuild/resources/${resource}
--          DESTINATION lib/libscanbuild/resources
-+          DESTINATION ${CMAKE_INSTALL_LIBDIR}/libscanbuild/resources
-           COMPONENT scan-build-py)
- endforeach()
+@@ -109,7 +109,7 @@ if(CLANG_INSTALL_SCANBUILDPY)
+                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource})
+     list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource})
+     install(FILES lib/libscanbuild/resources/${resource}
+-            DESTINATION lib/libscanbuild/resources
++            DESTINATION ${CMAKE_INSTALL_LIBDIR}/libscanbuild/resources
+             COMPONENT scan-build-py)
+   endforeach()
  
-@@ -122,7 +122,7 @@ foreach(lib ${LibEar})
-                      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib})
-   list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib})
-   install(FILES lib/libear/${lib}
--          DESTINATION lib/libear
-+          DESTINATION ${CMAKE_INSTALL_LIBDIR}/libear
-           COMPONENT scan-build-py)
- endforeach()
+@@ -125,7 +125,7 @@ if(CLANG_INSTALL_SCANBUILDPY)
+                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib})
+     list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib})
+     install(FILES lib/libear/${lib}
+-            DESTINATION lib/libear
++            DESTINATION ${CMAKE_INSTALL_LIBDIR}/libear
+             COMPONENT scan-build-py)
+   endforeach()
  
 diff --git a/cmake/Modules/GNUInstallPackageDir.cmake b/cmake/Modules/GNUInstallPackageDir.cmake
 index e4a058e68f4f..e4e84b6fc057 100644
@@ -185,30 +185,28 @@ index e61efbb303fc..a73c58584567 100644
  config.substitutions.append(('%{flags}', '--sysroot=@CMAKE_INSTALL_PREFIX@'))
  
 diff --git a/libdevice/cmake/modules/SYCLLibdevice.cmake b/libdevice/cmake/modules/SYCLLibdevice.cmake
-index 21989df43c00..36aee071dd96 100644
+index 4f7d06e668ba..7ecd77ebc002 100644
 --- a/libdevice/cmake/modules/SYCLLibdevice.cmake
 +++ b/libdevice/cmake/modules/SYCLLibdevice.cmake
-@@ -12,16 +12,16 @@ else()
-   set(obj-suffix o)
-   set(obj-new-offload-suffix new.o)
-   set(spv_binary_dir "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
--  set(install_dest_spv lib${LLVM_LIBDIR_SUFFIX})
-+  set(install_dest_spv ${CMAKE_INSTALL_LIBDIR})
+@@ -6,15 +6,15 @@ else()
    set(devicelib_host_static_obj libsycl-devicelib-host.a)
-   set(devicelib_host_static_obj-new-offload libsycl-devicelib-host.new.a)
  endif()
- set(spv-suffix spv)
  set(bc-suffix bc)
- set(bc_binary_dir "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
 -set(install_dest_obj lib${LLVM_LIBDIR_SUFFIX})
--set(install_dest_obj-new-offload lib${LLVM_LIBDIR_SUFFIX})
--set(install_dest_bc lib${LLVM_LIBDIR_SUFFIX})
 +set(install_dest_obj ${CMAKE_INSTALL_LIBDIR})
-+set(install_dest_obj-new-offload ${CMAKE_INSTALL_LIBDIR})
-+set(install_dest_bc ${CMAKE_INSTALL_LIBDIR})
  
- string(CONCAT sycl_targets_opt
-   "-fsycl-targets="
+ if(WIN32)
+   # On Windows, install to lib/
+-  set(install_dest_bc lib${LLVM_LIBDIR_SUFFIX})
++  set(install_dest_bc ${CMAKE_INSTALL_LIBDIR})
+   set(bc_binary_dir "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
+ else()
+   # On other platforms, install to lib/dpcpp-<major_ver>/sycl
+-  set(bc_dir "lib${LLVM_LIBDIR_SUFFIX}/dpcpp-${DPCPP_VERSION_MAJOR}/sycl")
++  set(bc_dir "${CMAKE_INSTALL_LIBDIR}/dpcpp-${DPCPP_VERSION_MAJOR}/sycl")
+   set(install_dest_bc ${bc_dir})
+   set(bc_binary_dir "${CMAKE_BINARY_DIR}/${bc_dir}")
+ endif()
 diff --git a/libunwind/test/configs/armv7m-picolibc-libunwind.cfg.in b/libunwind/test/configs/armv7m-picolibc-libunwind.cfg.in
 index 6ffdd70c6177..fadb6b3cb02f 100644
 --- a/libunwind/test/configs/armv7m-picolibc-libunwind.cfg.in
@@ -237,7 +235,7 @@ index 37f73afa915f..1f70cfe4fc05 100644
  
      if (NOT CMAKE_CONFIGURATION_TYPES)
 diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake
-index 5d58abf237f5..fd2edc4e3a66 100644
+index 6493df27f38d..e4fa0b72990e 100644
 --- a/lldb/cmake/modules/AddLLDB.cmake
 +++ b/lldb/cmake/modules/AddLLDB.cmake
 @@ -106,7 +106,7 @@ function(add_lldb_library name)
@@ -274,10 +272,10 @@ index 814c59251611..7188084e8061 100644
  Name: LLVMSPIRVLib
  Description: LLVM/SPIR-V bi-directional translator
 diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
-index 9bbd39abd558..78b8da693007 100644
+index 4518d3e1264d..ee11de0a3a09 100644
 --- a/llvm/CMakeLists.txt
 +++ b/llvm/CMakeLists.txt
-@@ -1207,9 +1207,9 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "")
+@@ -1197,9 +1197,9 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "")
    add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src
      ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime)
    install(TARGETS tf_xla_runtime EXPORT LLVMExports
@@ -290,10 +288,10 @@ index 9bbd39abd558..78b8da693007 100644
    # Once we add more modules, we should handle this more automatically.
    if (DEFINED LLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL)
 diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
-index 7d40d309d538..5844f0f2a2fa 100644
+index d938214f9d0d..dc39a292aa90 100644
 --- a/llvm/cmake/modules/AddLLVM.cmake
 +++ b/llvm/cmake/modules/AddLLVM.cmake
-@@ -974,8 +974,8 @@ macro(add_llvm_library name)
+@@ -955,8 +955,8 @@ macro(add_llvm_library name)
        endif()
        install(TARGETS ${name}
                ${export_to_llvmexports}
@@ -304,7 +302,7 @@ index 7d40d309d538..5844f0f2a2fa 100644
                RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name})
  
        if (NOT LLVM_ENABLE_IDE)
-@@ -2284,7 +2284,7 @@ function(llvm_install_library_symlink name dest type)
+@@ -2279,7 +2279,7 @@ function(llvm_install_library_symlink name dest type)
      set(LLVM_LINK_OR_COPY copy)
    endif()
  
@@ -313,7 +311,7 @@ index 7d40d309d538..5844f0f2a2fa 100644
    if((WIN32 OR CYGWIN) AND "${type}" STREQUAL "SHARED")
      set(output_dir "${CMAKE_INSTALL_BINDIR}")
    endif()
-@@ -2566,10 +2566,10 @@ function(llvm_setup_rpath name)
+@@ -2561,10 +2561,10 @@ function(llvm_setup_rpath name)
      # Since BUILD_SHARED_LIBS is only recommended for use by developers,
      # hardcode the rpath to build/install lib dir first in this mode.
      # FIXME: update this when there is better solution.
@@ -328,10 +326,10 @@ index 7d40d309d538..5844f0f2a2fa 100644
        set_property(TARGET ${name} APPEND_STRING PROPERTY
                     LINK_FLAGS " -Wl,-z,origin ")
 diff --git a/llvm/cmake/modules/AddOCaml.cmake b/llvm/cmake/modules/AddOCaml.cmake
-index 2d9116b08a52..076649279eb2 100644
+index 9a393ae3b747..23b22a99ed74 100644
 --- a/llvm/cmake/modules/AddOCaml.cmake
 +++ b/llvm/cmake/modules/AddOCaml.cmake
-@@ -147,9 +147,9 @@ function(add_ocaml_library name)
+@@ -150,9 +150,9 @@ function(add_ocaml_library name)
    endforeach()
  
    if( APPLE )
@@ -390,10 +388,10 @@ index e4e1d449bf4d..890e1f164d97 100644
  #define LLVM_INSTALL_PACKAGE_DIR "@LLVM_INSTALL_PACKAGE_DIR@"
  #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@"
 diff --git a/llvm/tools/llvm-config/llvm-config.cpp b/llvm/tools/llvm-config/llvm-config.cpp
-index 020b1b5e093d..bfb58ce73a2b 100644
+index 24ea264419af..26aaf93c4c71 100644
 --- a/llvm/tools/llvm-config/llvm-config.cpp
 +++ b/llvm/tools/llvm-config/llvm-config.cpp
-@@ -364,7 +364,7 @@ int main(int argc, char **argv) {
+@@ -367,7 +367,7 @@ int main(int argc, char **argv) {
        sys::path::make_absolute(ActivePrefix, Path);
        ActiveBinDir = std::string(Path);
      }
@@ -424,10 +422,10 @@ index 6589458ab789..9bff1af30631 100644
  
      if (NOT LLVM_ENABLE_IDE)
 diff --git a/mlir/cmake/modules/AddMLIRPython.cmake b/mlir/cmake/modules/AddMLIRPython.cmake
-index fa6aec8a603a..4e1b61ff12fe 100644
+index 97873d0c07ab..1cdb8c4f9cc5 100644
 --- a/mlir/cmake/modules/AddMLIRPython.cmake
 +++ b/mlir/cmake/modules/AddMLIRPython.cmake
-@@ -567,7 +567,7 @@ function(mlir_python_setup_extension_rpath target)
+@@ -688,7 +688,7 @@ function(mlir_python_setup_extension_rpath target)
      set_property(TARGET ${target} APPEND PROPERTY
        BUILD_RPATH "${_real_lib_dir}")
      set_property(TARGET ${target} APPEND PROPERTY
@@ -475,10 +473,19 @@ index 9bd7b0b0ea59..1232f5f0d748 100644
        COMPONENT ${name})
    endif()
 diff --git a/sycl/CMakeLists.txt b/sycl/CMakeLists.txt
-index cb2220e9fbc1..eec767d4f874 100644
+index 9d11782674dd..2969893f4b4a 100644
 --- a/sycl/CMakeLists.txt
 +++ b/sycl/CMakeLists.txt
-@@ -362,13 +362,13 @@ if (NOT WIN32)
+@@ -295,7 +295,7 @@ add_custom_command(
+ install(DIRECTORY "${sycl_inc_dir}/sycl" DESTINATION ${SYCL_INCLUDE_DIR} COMPONENT sycl-headers)
+ install(DIRECTORY "${sycl_inc_dir}/CL" DESTINATION ${SYCL_INCLUDE_DIR}/ COMPONENT sycl-headers)
+ install(DIRECTORY "${sycl_inc_dir}/std" DESTINATION ${SYCL_INCLUDE_DIR} COMPONENT sycl-headers)
+-install(DIRECTORY "${UNIFIED_RUNTIME_INCLUDE_DIR}/unified-runtime" DESTINATION ${SYCL_INCLUDE_DIR} COMPONENT sycl-headers)
++install(DIRECTORY "${UNIFIED_RUNTIME_INCLUDE_DIR}/unified-runtime" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT sycl-headers)
+ 
+ if (WIN32)
+   set(SYCL_RT_LIBS sycl${SYCL_MAJOR_VERSION})
+@@ -348,13 +348,13 @@ if (NOT WIN32)
    install(FILES
      "${CMAKE_CURRENT_SOURCE_DIR}/gdb/libsycl.so-gdb.py"
      RENAME "libsycl.so.${SYCL_VERSION_STRING}-gdb.py"
@@ -493,12 +500,12 @@ index cb2220e9fbc1..eec767d4f874 100644
 +      DESTINATION ${CMAKE_INSTALL_LIBDIR}/
        COMPONENT sycl-headers-extras)
    endif()
- endif()
+ 
 diff --git a/sycl/cmake/modules/BuildUnifiedRuntime.cmake b/sycl/cmake/modules/BuildUnifiedRuntime.cmake
-index 73e52e59f2be..aa0eac5c1dee 100644
+index 646ca364a10f..724569d6c9fe 100644
 --- a/sycl/cmake/modules/BuildUnifiedRuntime.cmake
 +++ b/sycl/cmake/modules/BuildUnifiedRuntime.cmake
-@@ -108,9 +108,9 @@ find_package(Threads REQUIRED)
+@@ -112,9 +112,9 @@ find_package(Threads REQUIRED)
  if(TARGET UnifiedRuntimeLoader)
    # Install the UR loader.
    install(TARGETS ur_loader
@@ -511,7 +518,7 @@ index 73e52e59f2be..aa0eac5c1dee 100644
    )
  endif()
  
-@@ -120,8 +120,8 @@ function(add_sycl_ur_adapter NAME)
+@@ -124,8 +124,8 @@ function(add_sycl_ur_adapter NAME)
    add_dependencies(UnifiedRuntimeAdapters ur_adapter_${NAME})
  
    install(TARGETS ur_adapter_${NAME}
@@ -522,7 +529,7 @@ index 73e52e59f2be..aa0eac5c1dee 100644
  
    set(manifest_file
      ${CMAKE_CURRENT_BINARY_DIR}/install_manifest_ur_adapter_${NAME}.txt)
-@@ -274,24 +274,24 @@ if(CMAKE_SYSTEM_NAME STREQUAL Windows)
+@@ -278,24 +278,24 @@ if(CMAKE_SYSTEM_NAME STREQUAL Windows)
    # Add the debug UR runtime libraries to the parent install.
    install(
      FILES ${URD_INSTALL_DIR}/bin/ur_loaderd.dll
@@ -567,10 +574,10 @@ index f469b2604760..a8728bdfb5b1 100644
              COMPONENT ${ARG_TARGET_NAME}
              OPTIONAL)
 diff --git a/sycl/source/CMakeLists.txt b/sycl/source/CMakeLists.txt
-index be262a28d809..36da90e63179 100644
+index 40327b594678..5f25cb498381 100644
 --- a/sycl/source/CMakeLists.txt
 +++ b/sycl/source/CMakeLists.txt
-@@ -191,7 +191,7 @@ function(add_sycl_rt_library LIB_NAME LIB_OBJ_NAME)
+@@ -198,7 +198,7 @@ function(add_sycl_rt_library LIB_NAME LIB_OBJ_NAME)
          COMMENT "Creating version-agnostic copy of the import library.")
        install(
          FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${ARG_IMPLIB_NAME}.lib
@@ -579,7 +586,7 @@ index be262a28d809..36da90e63179 100644
      endif()
    endif()
  
-@@ -430,6 +430,6 @@ if (WIN32)
+@@ -436,6 +436,6 @@ if (WIN32)
  endif()
  
  install(TARGETS ${SYCL_RT_LIBS}
@@ -623,7 +630,7 @@ index d1eb71823f64..9bf370bdcbe4 100644
 -  RUNTIME DESTINATION "bin" COMPONENT syclbin-dump)
 +  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT syclbin-dump)
 diff --git a/sycl/ur_win_proxy_loader/CMakeLists.txt b/sycl/ur_win_proxy_loader/CMakeLists.txt
-index 940fcd28299e..eac609967521 100644
+index 740a764269ea..dc8b98f83098 100644
 --- a/sycl/ur_win_proxy_loader/CMakeLists.txt
 +++ b/sycl/ur_win_proxy_loader/CMakeLists.txt
 @@ -14,7 +14,7 @@ configure_file(../../llvm/resources/windows_version_resource.rc ${CMAKE_CURRENT_
@@ -643,10 +650,10 @@ index 940fcd28299e..eac609967521 100644
 +    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ur_win_proxy_loader)
  endif()
 diff --git a/unified-runtime/CMakeLists.txt b/unified-runtime/CMakeLists.txt
-index 9115f52617c4..d23fd880ab99 100644
+index 2248cfcb3db2..b6c102721858 100644
 --- a/unified-runtime/CMakeLists.txt
 +++ b/unified-runtime/CMakeLists.txt
-@@ -361,7 +361,7 @@ target_include_directories(ur_headers INTERFACE
+@@ -363,7 +363,7 @@ target_include_directories(ur_headers INTERFACE
  # Add the include directory and the headers target to the install.
  install(
      DIRECTORY "${PROJECT_SOURCE_DIR}/include/"
@@ -655,7 +662,7 @@ index 9115f52617c4..d23fd880ab99 100644
  install(
      TARGETS ur_headers
      EXPORT ${PROJECT_NAME}-targets)
-@@ -384,7 +384,7 @@ install(
+@@ -386,7 +386,7 @@ install(
      EXPORT ${PROJECT_NAME}-targets
      FILE ${PROJECT_NAME}-targets.cmake
      NAMESPACE ${PROJECT_NAME}::
@@ -664,7 +671,7 @@ index 9115f52617c4..d23fd880ab99 100644
  
  # Configure the package versions file for use in find_package when installed.
  write_basic_package_version_file(
-@@ -395,14 +395,14 @@ write_basic_package_version_file(
+@@ -397,14 +397,14 @@ write_basic_package_version_file(
  configure_package_config_file(
      ${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}-config.cmake.in
      ${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}-config.cmake
@@ -695,13 +702,13 @@ index d79c3a9da8bd..6aac2abcd9ea 100644
  
  Name: Unified Runtime Loader
 diff --git a/xpti/src/CMakeLists.txt b/xpti/src/CMakeLists.txt
-index 1d7e371e98a1..8d3e1a8b4ec3 100644
+index 0f6692c18347..5728d1834f8a 100644
 --- a/xpti/src/CMakeLists.txt
 +++ b/xpti/src/CMakeLists.txt
-@@ -11,9 +11,9 @@ macro(add_xpti_lib target_name)
- 
-   # Set the location of the library installation
+@@ -22,9 +22,9 @@ macro(add_xpti_lib target_name)
+   # Set the location of the library installation.
    install(TARGETS ${target_name}
+     EXPORT xptiTargets
 -    RUNTIME DESTINATION bin COMPONENT xpti
 -    LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT xpti
 -    ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT xpti
@@ -712,7 +719,7 @@ index 1d7e371e98a1..8d3e1a8b4ec3 100644
  endmacro()
  
 diff --git a/xptifw/CMakeLists.txt b/xptifw/CMakeLists.txt
-index 00a9c71ba289..dd590e688b8f 100644
+index 78549309cafe..29d29e005b1b 100644
 --- a/xptifw/CMakeLists.txt
 +++ b/xptifw/CMakeLists.txt
 @@ -13,9 +13,9 @@ set(SAMPLES_DIR ${CMAKE_CURRENT_LIST_DIR}/samples)
@@ -728,13 +735,13 @@ index 00a9c71ba289..dd590e688b8f 100644
  endif()
  
 diff --git a/xptifw/src/CMakeLists.txt b/xptifw/src/CMakeLists.txt
-index 1026bc505f4e..5816b3a75cf5 100644
+index 5e865aa3714e..10e6bfc925e3 100644
 --- a/xptifw/src/CMakeLists.txt
 +++ b/xptifw/src/CMakeLists.txt
-@@ -81,9 +81,9 @@ function(add_xpti_library LIB_NAME)
-   # Set the location of the library installation
+@@ -93,9 +93,9 @@ function(add_xpti_library LIB_NAME)
    include(GNUInstallDirs)
    install(TARGETS ${LIB_NAME}
+     EXPORT xptifwTargets
 -    RUNTIME DESTINATION bin COMPONENT xptifw
 -    LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT xptifw
 -    ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT xptifw
diff --git a/pkgs/by-name/in/intel-llvm/package.nix b/pkgs/by-name/in/intel-llvm/package.nix
index ff0f492f2e29..055a29438543 100644
--- a/pkgs/by-name/in/intel-llvm/package.nix
+++ b/pkgs/by-name/in/intel-llvm/package.nix
@@ -6,6 +6,13 @@
   overrideCC,
   lib,
   fetchFromGitHub,
+  writeShellApplication,
+  nix,
+  nix-update,
+  nix-prefetch-github,
+  curl,
+  jq,
+  onedpl,
 }:
 let
   # This derivation uses makeScope to help with overriding.
@@ -42,28 +49,26 @@ let
 
     llvmMajorVersion = "22";
 
-    version = "unstable-2025-11-14";
+    version = "7.0.0";
 
     src = fetchFromGitHub {
       owner = "intel";
       repo = "llvm";
-      # Latest commit which doesn't require dependency versions newer than
-      # what's available in nixpkgs as of 2026-01-13.
-      # Commits after require newer level-zero and pre-release unified memory framework.
-      rev = "ab3dc98de0fd1ada9df12b138de1e1f8b715cc27";
-      hash = "sha256-oHk8kQVNsyC9vrOsDqVoFLYl2yMMaTgpQnAW9iHZLfE=";
+      tag = "v${self.version}";
+      hash = "sha256-l4InHzR/W6Gihoxt9CjEREyB9LDIDQggskzFIPIS2bA=";
     };
 
+    # The commit date of the release tag above, kept in sync by `updateScript`.
     # If you override src, you'll probably also want to override this,
-    # as some packages check for this date to decide what features the compiler supports
-    commitDate = "20251114";
+    # as some packages check for this date to decide what features the compiler supports.
+    commitDate = "20260713";
 
     vc-intrinsics-src = fetchFromGitHub {
       owner = "intel";
       repo = "vc-intrinsics";
-      # See llvm/lib/SYCLLowerIR/CMakeLists.txt:17
+      # See LLVMGenXIntrinsics_GIT_TAG in llvm/lib/SYCLLowerIR/CMakeLists.txt
       rev = "60cea7590bd022d95f5cf336ee765033bd114d69";
-      sha256 = "sha256-1K16UEa6DHoP2ukSx58OXJdtDWyUyHkq5Gd2DUj1644=";
+      hash = "sha256-1K16UEa6DHoP2ukSx58OXJdtDWyUyHkq5Gd2DUj1644=";
     };
 
     # ===============================
@@ -111,6 +116,7 @@ let
         mkdir "$rsrc"
         echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
         ln -s "${lib.getLib self.unwrapped}/lib/clang/${self.llvmMajorVersion}/include" "$rsrc"
+        ln -s "${lib.getLib self.unwrapped}/lib/clang/${self.llvmMajorVersion}/lib" "$rsrc"
       ''
       + (lib.concatStrings (
         lib.mapAttrsToList (k: v: ''
@@ -158,9 +164,28 @@ let
       ];
 
       passthru = self.unwrapped.passthru // {
-        inherit (self) stdenv;
-        unwrapped = self.unwrapped;
-        tests = callPackage ./tests.nix { inherit (self) stdenv; };
+        inherit (self) stdenv unwrapped vc-intrinsics-src;
+
+        updateScript = lib.getExe (writeShellApplication {
+          name = "update-intel-llvm";
+          runtimeInputs = [
+            nix
+            nix-update
+            nix-prefetch-github
+            curl
+            jq
+          ];
+          text = builtins.readFile ./update.sh;
+        });
+
+        tests =
+          callPackage ./tests.nix {
+            inherit (self) stdenv;
+            inherit (self.unwrapped.unified-runtime) backends;
+          }
+          // {
+            inherit onedpl;
+          };
 
         overrideScope = newF: (self.overrideScope newF).merged;
       };
diff --git a/pkgs/by-name/in/intel-llvm/tests.nix b/pkgs/by-name/in/intel-llvm/tests.nix
index aa5a50ea1b7f..949b040af207 100644
--- a/pkgs/by-name/in/intel-llvm/tests.nix
+++ b/pkgs/by-name/in/intel-llvm/tests.nix
@@ -1,39 +1,77 @@
 {
+  lib,
   stdenv,
   writeTextFile,
+  backends,
 }:
-{
-  sycl-compile = stdenv.mkDerivation {
-    name = "intel-llvm-test-sycl-compile";
+let
+  src = writeTextFile {
+    name = "test.cpp";
+    text = ''
+      #include <sycl/sycl.hpp>
+      #include <iostream>
 
-    src = writeTextFile {
-      name = "test.cpp";
-      text = ''
-        #include <sycl/sycl.hpp>
-        #include <iostream>
-
-        int main() {
-          sycl::queue q;
-          std::cout << "SYCL queue created successfully" << std::endl;
-          return 0;
-        }
-      '';
-    };
-
-    dontUnpack = true;
-
-    buildPhase = ''
-      echo "Checking if a basic SYCL program can compile..."
-      clang++ -fsycl $src -o test
+      int main() {
+        sycl::queue q;
+        std::cout << "SYCL queue created successfully" << std::endl;
+        return 0;
+      }
     '';
-
-    installPhase = ''
-      mkdir -p $out/bin
-      cp test $out/bin/sycl-test
-    '';
-
-    meta = {
-      description = "Test that intel-llvm can compile a basic SYCL program";
-    };
   };
-}
+
+  targets = [
+    # SPIR-V is a bit of a special case; it's always available
+    # and needs no device libraries.
+    {
+      name = "spir64";
+      flags = [ ];
+    }
+  ]
+  ++ lib.optional (lib.elem "native_cpu" backends) {
+    name = "native_cpu";
+    flags = [ "-fsycl-targets=native_cpu" ];
+  }
+  ++ lib.optional (lib.elem "cuda" backends) {
+    name = "nvptx64-nvidia-cuda";
+    # Defaults to sm_75.
+    flags = [ "-fsycl-targets=nvptx64-nvidia-cuda" ];
+  }
+  ++ lib.optional (lib.elem "hip" backends) {
+    name = "amdgcn-amd-amdhsa";
+    # AMD has no default arch, so we have to name one. It doesn't matter which,
+    # as we only care that the device libraries are found at all.
+    flags = [
+      "-fsycl-targets=amdgcn-amd-amdhsa"
+      "-Xsycl-target-backend=amdgcn-amd-amdhsa"
+      "--offload-arch=gfx90a"
+    ];
+  };
+
+  mkTest =
+    { name, flags }:
+    stdenv.mkDerivation {
+      name = "intel-llvm-test-sycl-compile-${name}";
+
+      inherit src;
+
+      dontUnpack = true;
+
+      buildPhase = ''
+        echo "Checking if a SYCL program can be built for ${name}..."
+        clang++ -fsycl ${lib.escapeShellArgs flags} $src -o test
+      '';
+
+      installPhase = ''
+        mkdir -p $out/bin
+        cp test $out/bin/sycl-test
+      '';
+
+      meta = {
+        description = "Test that intel-llvm can build a SYCL program for ${name}";
+        mainProgram = "sycl-test";
+      };
+    };
+in
+lib.listToAttrs (
+  map (target: lib.nameValuePair "sycl-compile-${target.name}" (mkTest target)) targets
+)
diff --git a/pkgs/by-name/in/intel-llvm/unified-runtime.nix b/pkgs/by-name/in/intel-llvm/unified-runtime.nix
index 1bd3cf296469..41bdfd477ce0 100644
--- a/pkgs/by-name/in/intel-llvm/unified-runtime.nix
+++ b/pkgs/by-name/in/intel-llvm/unified-runtime.nix
@@ -111,14 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
     filecheck
   ];
 
-  postPatch = ''
-    # `NO_CMAKE_PACKAGE_REGISTRY` prevents it from finding OpenCL, so we unset it
-    # Note that this cmake file is imported in various places, not just unified-runtime
-    # See also: https://github.com/intel/llvm/issues/19635#issuecomment-3247008981
-    substituteInPlace cmake/FetchOpenCL.cmake \
-        --replace-fail "NO_CMAKE_PACKAGE_REGISTRY" ""
-  ''
-  + lib.optionalString finalAttrs.doCheck ''
+  postPatch = lib.optionalString finalAttrs.doCheck ''
     # These tests don't run without setting UR_DPCXX,
     # however they aren't properly excluded, causing lit to fail.
     rm test/adapters/hip/lit.cfg.py
@@ -196,7 +189,7 @@ stdenv.mkDerivation (finalAttrs: {
       asl20
       llvm-exception
     ];
-    maintainers = with lib.maintainers; [ blenderfreaky ];
+    maintainers = with lib.maintainers; [ kilyanni ];
     platforms = [ "x86_64-linux" ];
   };
 })
diff --git a/pkgs/by-name/in/intel-llvm/unwrapped.nix b/pkgs/by-name/in/intel-llvm/unwrapped.nix
index 269205435786..1278a29ac1d7 100644
--- a/pkgs/by-name/in/intel-llvm/unwrapped.nix
+++ b/pkgs/by-name/in/intel-llvm/unwrapped.nix
@@ -11,6 +11,7 @@
   stdenv,
   cmake,
   ninja,
+  fetchpatch,
   python3,
   pkg-config,
   zstd,
@@ -61,6 +62,13 @@ let
         isClang = true;
         langC = true;
         langCC = true;
+
+        # cc-wrapper adds `-nostdlibinc` to every Linux clang, which makes the SYCL driver
+        # skip its `stl_wrappers` include dir, caysubg libdevice compiles then fail with
+        # `'__spirv_BuiltIn...' undeclared`. `isROCm` is cc-wrapper's only opt-out
+        # from that flag and is read nowhere else.
+        # The name is a poor fit, but it does exactly what we want.
+        isROCm = true;
       };
     }
   );
@@ -155,6 +163,13 @@ stdenv.mkDerivation (finalAttrs: {
     # they cause cycles in the outputs and break the build,
     # so we simply exclude them.
     ./sycl-jit-exclude-cmake-files.patch
+
+    # Linux removed `linux/scc.h`, which breaks building compiler-rt. Upstream LLVM has fixed it in LLVM 22 and 23.
+    # The same patch is applied in d5b6cbf (llvmPackages_{18,19,20,21}.compiler-rt: backport santizier fix for Linux)
+    (fetchpatch {
+      url = "https://github.com/llvm/llvm-project/commit/3dc4fd6dd41100f051a63642f449b16324389c96.patch?full_index=1";
+      hash = "sha256-BJwFPeYCBO+PnUMMC/3GSYPgn0vczkkbdw5qcnURPbI=";
+    })
   ];
 
   postPatch = ''
@@ -180,12 +195,26 @@ stdenv.mkDerivation (finalAttrs: {
       unified-runtime/cmake/FetchLevelZero.cmake \
       sycl/CMakeLists.txt \
       sycl/cmake/modules/FetchEmhash.cmake
-
-    # `NO_CMAKE_PACKAGE_REGISTRY` prevents it from finding OpenCL, so we unset it
-    # Note that this cmake file is imported in various places, not just unified-runtime
-    # See also: https://github.com/intel/llvm/issues/19635#issuecomment-3247008981
-    substituteInPlace unified-runtime/cmake/FetchOpenCL.cmake \
-        --replace-fail "NO_CMAKE_PACKAGE_REGISTRY" ""
+  ''
+  # v7.0.0 half-applied an upstream rename of libclc's AMD target. Without this patch,
+  # The compiler builds and links fully, but the final compiler will lack the device libraries
+  # needed for compilating to AMD.
+  # Build `pkgsRocm.intel-llvm.tests.sycl-compile-amdgcn-amd-amdhsa` to check; it fails without this patch.
+  # TODO: It's likely that we can drop this on the next update.
+  + lib.optionalString rocmSupport ''
+    substituteInPlace libclc/CMakeLists.txt \
+      --replace-fail $'  amdgcn-amd-amdhsa\n' $'  amdgcn-amd-amdhsa\n  amdgcn--amdhsa\n' \
+      --replace-fail 'set( amdgcn-amd-amdhsa_devices none )' \
+        $'set( amdgcn-amd-amdhsa_devices none )\nset( amdgcn--amdhsa_devices none )'
+  ''
+  # These libdevice compiles target sm_75 (since v7.0.0), which needs PTX >= 6.3.
+  # clang picks the PTX ISA from the CUDA version it detects, if it detects nothing it falls back to `+ptx42`.
+  # `-nocudalib` only skips linking libdevice.bc, not detection, so point --cuda-path
+  # at the toolkit to get a real version and a modern PTX ISA.
+  + lib.optionalString cudaSupport ''
+    substituteInPlace libdevice/cmake/modules/SYCLLibdevice.cmake \
+      --replace-fail '"--cuda-gpu-arch=sm_75" "-nocudalib"' \
+      '"--cuda-gpu-arch=sm_75" "-nocudalib" "--cuda-path=${unified-runtime.setupVars.CUDA_PATH}"'
   '';
 
   preConfigure = ''
@@ -197,7 +226,6 @@ stdenv.mkDerivation (finalAttrs: {
         ${lib.optionalString cudaSupport "--cuda"} \
         ${lib.optionalString rocmSupport "--hip"} \
         ${lib.optionalString nativeCpuSupport "--native_cpu"} \
-        --use-lld \
         ${lib.optionalString levelZeroSupport "--l0-headers ${lib.getInclude level-zero}/include/level_zero"} \
         ${lib.optionalString levelZeroSupport "--l0-loader ${lib.getLib level-zero}/lib/libze_loader.so"} \
     )
@@ -226,6 +254,11 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "LLVM_ENABLE_ZLIB" "FORCE_ON")
     (lib.cmakeBool "LLVM_ENABLE_THREADS" true)
 
+    # Link with lld. Not buildbot's `--use-lld` (LLVM_ENABLE_LLD=ON): xpti/xptifw
+    # re-`include(HandleLLVMOptions)`, which derives LLVM_USE_LINKER from it and then
+    # aborts on "LLVM_ENABLE_LLD and LLVM_USE_LINKER can't be set at the same time".
+    (lib.cmakeFeature "LLVM_USE_LINKER" "lld")
+
     # Intels LLVM fork does not support building shared libraries,
     # see https://github.com/intel/llvm/issues/19060
     (lib.cmakeBool "BUILD_SHARED_LIBS" false)
diff --git a/pkgs/by-name/in/intel-llvm/update.sh b/pkgs/by-name/in/intel-llvm/update.sh
new file mode 100644
index 000000000000..e6987e81bf64
--- /dev/null
+++ b/pkgs/by-name/in/intel-llvm/update.sh
@@ -0,0 +1,41 @@
+nixFile=pkgs/by-name/in/intel-llvm/package.nix
+
+nix-update intel-llvm.unwrapped --override-filename "$nixFile" \
+  --use-github-releases --version-regex '^v(\d+\.\d+\.\d+)$'
+
+# `commitDate` has to move with the version, or the bump silently
+# keeps claiming the feature set of the previous release. It is not
+# derivable from the tarball, as fetchFromGitHub drops `.git`.
+version=$(sed -n 's/^ *version = "\(.*\)";$/\1/p' "$nixFile")
+[ -n "$version" ] || { echo "failed to read back version" >&2; exit 1; }
+
+commitDate=$(
+  curl -sSf "https://api.github.com/repos/intel/llvm/commits/v$version" \
+    | jq -r .commit.committer.date | cut -dT -f1 | tr -d -
+)
+
+sed -i "s/commitDate = \"[0-9]*\"/commitDate = \"$commitDate\"/" "$nixFile"
+grep -q "commitDate = \"$commitDate\";" "$nixFile" ||
+  { echo "failed to update commitDate to $commitDate" >&2; exit 1; }
+
+vcRev=$(
+  curl -sSf "https://raw.githubusercontent.com/intel/llvm/v$version/llvm/lib/SYCLLowerIR/CMakeLists.txt" \
+    | sed -n 's/^ *set(LLVMGenXIntrinsics_GIT_TAG \([^ )]*\)).*/\1/p'
+)
+[ -n "$vcRev" ] || { echo "failed to extract LLVMGenXIntrinsics_GIT_TAG" >&2; exit 1; }
+
+if ! grep -q "rev = \"$vcRev\";" "$nixFile"; then
+  vcHash=$(nix-prefetch-github intel vc-intrinsics --rev "$vcRev" | jq -r .hash)
+
+  vcOldRev=$(nix eval --raw -f . intel-llvm.vc-intrinsics-src.rev)
+  vcOldHash=$(nix eval --raw -f . intel-llvm.vc-intrinsics-src.hash)
+
+  sed -i \
+    -e "s|rev = \"$vcOldRev\";|rev = \"$vcRev\";|" \
+    -e "s|hash = \"$vcOldHash\";|hash = \"$vcHash\";|" \
+    "$nixFile"
+  if ! grep -q "rev = \"$vcRev\";" "$nixFile" || ! grep -q "hash = \"$vcHash\";" "$nixFile"; then
+    echo "failed to update vc-intrinsics-src" >&2
+    exit 1
+  fi
+fi