rarias/jungle
2
0
Fork 3
Code Issues 62 Pull Requests 10 Actions Packages Projects 1 Releases Wiki Activity

Use explicit version instead of wildcard in intel

Browse Source 
Reviewed-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
This commit is contained in:
Aleix Boné
2026-03-16 16:28:31 +01:00
parent 95b412ddc1
commit f41bdf88bd
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,7 +39,9 @@ lib.makeOverridable (
removeAttrs
;
__components = removeAttrs components [ "extraPackages" ];
inherit (components) llvmMajorVersion;
__components = removeAttrs components [ "extraPackages" "llvmMajorVersion" ];
_components = __components;
# _components = lib.traceSeqN 2 {
# inherit unpatched __components;
@@ -63,7 +65,7 @@ lib.makeOverridable (
];
cc-cflags = [
"--gcc-toolchain=${gcc.cc}"
"-isystem \"${cc.original}/lib/clang/*/include\""
"-isystem ${cc.original or cc}/lib/clang/${toString cc.llvmMajorVersion}/include"
"-isystem ${cc}/include"
"-isystem ${cc}/include/intel64"
"-isystem ${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}/include"
@@ -171,7 +173,7 @@ lib.makeOverridable (
pname = "intel-${folder}";
inherit version;
paths = [ original ] ++ lib.optionals (folder == "compiler") [ etc-vendors ];
passthru = { inherit original; };
passthru = { inherit original llvmMajorVersion; };
}
) _components;
in