diff --git a/pkgs/intel-oneapi/patch_intel.nix b/pkgs/intel-oneapi/patch_intel.nix
index c2de540..62df434 100644
--- a/pkgs/intel-oneapi/patch_intel.nix
+++ b/pkgs/intel-oneapi/patch_intel.nix
@@ -67,7 +67,7 @@ lib.makeOverridable (
             ];
             cc-cflags = [
               "--gcc-toolchain=${gcc.cc}"
-              "-isystem \"$(dirname $(realpath ${cc}/lib/clang/*/include/stddef.h))\""
+              "-isystem \"${cc.original}/lib/clang/*/include\""
               "-isystem ${cc}/include"
               "-isystem ${cc}/include/intel64"
               "-isystem ${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}/include"
@@ -146,11 +146,15 @@ lib.makeOverridable (
       let
         pkgs = mapAttrs (
           folder: version:
-          symlinkJoin {
+          let
+            original = "${finalAttrs.finalPackage}/${folder}/${version}";
+          in
+          (symlinkJoin {
             pname = "intel-${folder}";
             inherit version;
-            paths = [ "${finalAttrs.finalPackage}/${folder}/${version}" ];
-          }
+            paths = [ original ];
+          }).overrideAttrs
+            { passthru = { inherit original; }; }
         ) _components;
       in
       pkgs