diff options
| author | a-n-n-a-l-e-e <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2024-01-29 22:25:38 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-29 22:25:38 -0800 |
| commit | 425588f2079a7a5b8465b55330acbbe5360e1a88 (patch) | |
| tree | e99f513098bf38f41a070884614adc22625464b8 /pkgs/os-specific/windows | |
| parent | b5293afa853917689666229d7af99a331f64e1ee (diff) | |
| parent | 7a0dc7c7e87cd9bd3f3272a178660a495224ce46 (diff) | |
Merge pull request #283551 from a-n-n-a-l-e-e/llvmPackages_8-drop
treewide: drop LLVM8
Diffstat (limited to 'pkgs/os-specific/windows')
| -rw-r--r-- | pkgs/os-specific/windows/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix index dfd749dc2a9cb..7d152a607b8e4 100644 --- a/pkgs/os-specific/windows/default.nix +++ b/pkgs/os-specific/windows/default.nix @@ -17,9 +17,10 @@ lib.makeScope newScope (self: with self; { stdenv = crossLibcStdenv; }; + # FIXME untested with llvmPackages_16 was using llvmPackages_8 crossThreadsStdenv = overrideCC crossLibcStdenv (if stdenv.hostPlatform.useLLVM or false - then buildPackages.llvmPackages_8.clangNoLibcxx + then buildPackages.llvmPackages.clangNoLibcxx else buildPackages.gccWithoutTargetLibc.override (old: { bintools = old.bintools.override { libc = libcCross; |