diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-07-13 08:30:35 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-07-13 08:30:35 +0200 |
| commit | c77a0a323a634a927336cafdb0f0a1178b86aa0d (patch) | |
| tree | 6f44ea3493ca47b9afe714b5829ce89bb6d92b51 /pkgs/os-specific | |
| parent | 79f291cd1341ccc8844a9fa6dd918260328b12cd (diff) | |
| parent | bbf574c07142ab5d3d4ae99f424348716d6c47e0 (diff) | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/windows/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix index 8d6dd50548e51..12859de8a20fe 100644 --- a/pkgs/os-specific/windows/default.nix +++ b/pkgs/os-specific/windows/default.nix @@ -20,7 +20,7 @@ lib.makeScope newScope (self: with self; { crossThreadsStdenv = overrideCC crossLibcStdenv (if stdenv.hostPlatform.useLLVM or false then buildPackages.llvmPackages_8.clangNoLibcxx - else buildPackages.gccCrossStageStatic.override (old: { + else buildPackages.gccWithoutTargetLibc.override (old: { bintools = old.bintools.override { libc = libcCross; }; |