abonerib/jungle
1
0
Fork 0
forked from rarias/jungle
Code Pull Requests Activity

Properly find include path in patch intel wrapper

Browse Source
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
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/intel-oneapi/patch_intel.nix
View File

@ -67,7 +67,7 @@ lib.makeOverridable (
]; ];
cc-cflags = [ cc-cflags = [
"--gcc-toolchain=${gcc.cc}" "--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"
"-isystem ${cc}/include/intel64" "-isystem ${cc}/include/intel64"
"-isystem ${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}/include" "-isystem ${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}/include"
@ -146,11 +146,15 @@ lib.makeOverridable (
let let
pkgs = mapAttrs ( pkgs = mapAttrs (
folder: version: folder: version:
symlinkJoin { let
original = "${finalAttrs.finalPackage}/${folder}/${version}";
in
(symlinkJoin {
pname = "intel-${folder}"; pname = "intel-${folder}";
inherit version; inherit version;
paths = [ "${finalAttrs.finalPackage}/${folder}/${version}" ]; paths = [ original ];
} }).overrideAttrs
{ passthru = { inherit original; }; }
) _components; ) _components;
in in
pkgs pkgs