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

Add stdenv to llvm-intel passthru

Browse Source
This commit is contained in:
Aleix Boné
2026-03-16 17:32:41 +01:00
parent 6be58c257c
commit e8a51dc271
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
overlay.nix
View File

@@ -51,7 +51,6 @@ let
nix-wrap = callPackage ./pkgs/nix-wrap/default.nix { };
nodes = callPackage ./pkgs/nodes/default.nix { };
nosv = callPackage ./pkgs/nosv/default.nix { };
oneapiStdenv = final.overrideCC final.stdenv final.llvm-intel;
oneMath = callPackage ./pkgs/onemath/default.nix { };
openmp = callPackage ./pkgs/llvm-ompss2/openmp.nix { monorepoSrc = final.clangOmpss2Unwrapped.src; version = final.clangOmpss2Unwrapped.version; };
openmpv = final.openmp.override { enableNosv = true; enableOvni = true; };
@@ -106,9 +105,10 @@ let
# intel2023-sycl = hello-sycl.override { intelPackages = final.intelPackages_2023; }; # broken
intel2024-sycl = hello-sycl.override { intelPackages = final.intelPackages_2024; };
intel2025-sycl = hello-sycl.override { intelPackages = final.intelPackages_2025; };
oneapi-c = hello-c.override { stdenv = final.oneapiStdenv; };
oneapi-cpp = hello-cpp.override { stdenv = final.oneapiStdenv; };
oneapi-sycl = hello-sycl.override { intelPackages = { stdenv = final.oneapiStdenv; }; };
oneapi-c = hello-c.override { inherit (final.llvm-intel) stdenv; };
oneapi-cpp = hello-cpp.override { inherit (final.llvm-intel) stdenv; };
oneapi-sycl = hello-sycl.override { intelPackages = final.llvm-intel; };
oneapi-syclompss = hello-syclompss.override { intelPackages = final.llvm-intel; };
clangOmpss2-lto = lto.override { stdenv = final.stdenvClangOmpss2Nanos6; };
clangOmpss2-asan = asan.override { stdenv = final.stdenvClangOmpss2Nanos6; };
clangOmpss2-task = callPackage ./test/compilers/ompss2.nix {

6
pkgs/intel-oneapi/common/wrapper.nix
View File

@@ -3,6 +3,7 @@
lib,
gcc,
libgcc,
overrideCC,
wrapCCWith,
}:
@@ -66,6 +67,7 @@ in
''
+ extraBuildCommands;
}).overrideAttrs
(old: {
installPhase = old.installPhase + extraInstallCommands;
(finalAttrs: prevAttrs: {
installPhase = prevAttrs.installPhase + extraInstallCommands;
passthru.stdenv = overrideCC stdenv finalAttrs.finalPackage;
})