Use gcc13 for intel compiler

pkgs/intel-oneapi/patch_intel.nix

@@ -5,7 +5,7 @@
 , autoPatchelfHook
 , wrapCCWith
 , overrideCC
-, gcc
+, gcc13
 , hwloc
 , libelf
 , libffi_3_3
@@ -33,6 +33,8 @@ makeOverridable (
 let
   inherit (builtins) attrValues filter mapAttrs removeAttrs;
 
+  gcc = gcc13;
+
   __components = removeAttrs components ["extraPackages"];
   _components = __components;
   # _components = lib.traceSeqN 2 {
@@ -46,14 +48,25 @@ let
     in (wrapCCWith {
       inherit cc;
       extraBuildCommands = ''
-        echo "-isystem ${cc}/include" >> $out/nix-support/cc-cflags
-        echo "-isystem ${cc}/include/intel64" >> $out/nix-support/cc-cflags
-
         echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags
         echo "-L${gcc.cc.lib}/lib" >> $out/nix-support/cc-ldflags
         echo "-L${cc}/lib" >> $out/nix-support/cc-ldflags
 
-        echo "--gcc-toolchain=${gcc.cc}" >> $out/nix-support/libcxx-cxxflags
+        # echo "--gcc-toolchain=${gcc.cc}" >> $out/nix-support/libcxx-cxxflags
+        echo "--gcc-toolchain=${gcc.cc}" >> $out/nix-support/cc-cflags
+
+        # For some reason, If we don't resolve the realpath things go wrong
+        for stddef in ${cc}/lib/clang/*/include/stddef.h ; do
+          dir=$(dirname $(realpath "$stddef"))
+          echo "-isystem $dir" >> $out/nix-support/cc-cflags
+        done
+
+        echo "-isystem ${cc}/include" >> $out/nix-support/cc-cflags
+        echo "-isystem ${cc}/include/intel64" >> $out/nix-support/cc-cflags
+
+        for dir in ${gcc.cc}/lib/gcc/${targetConfig}/*/include; do
+          echo "-isystem $dir" >> $out/nix-support/cc-cflags
+        done
 
         for dir in ${gcc.cc}/include/c++/*; do
           echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags
@@ -62,18 +75,12 @@ let
           echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags
         done
 
-        # Need the gcc in the path
-        echo 'export "PATH=${gcc}/bin:$PATH"' >> $out/nix-support/cc-wrapper-hook
+        # FIXME: We should find a better way to modify the PATH instead of using
+        # this ugly hack. See https://jungle.bsc.es/git/rarias/bscpkgs/issues/9
+        echo 'path_backup="${gcc.cc}/bin:$path_backup"' >> $out/nix-support/cc-wrapper-hook
 
         # Disable hardening by default
         echo "" > $out/nix-support/add-hardening.sh
-
-        # For some reason, If we don't resolve the realpath things go wrong
-        for stddef in ${cc}/lib/clang/*/include/stddef.h ; do
-          dir=$(dirname $(realpath "$stddef"))
-          echo "-isystem $dir" >> $out/nix-support/cc-cflags
-        done
-
       '' + extraBuildCommands;
     } // (removeAttrs args ["cc" "extraBuildCommands" "extraInstall"])
     ).overrideAttrs (old: {
@@ -106,6 +113,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   autoPatchelfIgnoreMissingDeps = [ "libhwloc.so.5" "libcuda.so.1" "libze_loader.so.1" ];
 
+  dontCheckForBrokenSymlinks = true;
+
   nativeBuildInputs = [ autoPatchelfHook ];
   installPhase = ''
     cp -r $src/opt/intel/oneapi/ $out