From 3d56d438b6571b66f60bed7b20a3cc5c6099adef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleix=20Bon=C3=A9?= <aleix.boneribo@bsc.es>
Date: Wed, 10 Dec 2025 17:21:02 +0100
Subject: [PATCH] Properly find include path in patch intel wrapper

---
 pkgs/intel-oneapi/patch_intel.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/intel-oneapi/patch_intel.nix b/pkgs/intel-oneapi/patch_intel.nix
index ee521db..c659ae7 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,10 +146,14 @@ lib.makeOverridable (
       let
         pkgs = mapAttrs (
           folder: version:
+          let
+            original = "${finalAttrs.finalPackage}/${folder}/${version}";
+          in
           symlinkJoin {
             pname = "intel-${folder}";
             inherit version;
-            paths = [ "${finalAttrs.finalPackage}/${folder}/${version}" ];
+            paths = [ original ];
+            passthru = { inherit original; };
           }
         ) _components;
       in