Properly find include path in patch intel wrapper

This commit is contained in:
Aleix Boné 2025-12-10 17:21:02 +01:00
parent 01d7133a5d
commit 92d12c5f69
No known key found for this signature in database

View File

@ -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