diff options
| author | Vladimír Čunát <v@cunat.cz> | 2024-06-21 07:48:24 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2024-06-21 07:48:24 +0200 |
| commit | 879821772ca78519aec914983c3aa2cd77e90c1d (patch) | |
| tree | 5d837f3e0f32541ab0a4919260f5b02f0a8fb919 /pkgs/os-specific/windows/default.nix | |
| parent | 7154858e82d91010bb1289727b606687f32d1b92 (diff) | |
Revert #320852: Clean up cross bootstrapping
It rebuilt stdenv on *-darwin; we can't do that in nixpkgs master. This reverts commit 2f20501c5f188ab0c4c430519ce77bc6b988202b, reversing changes made to fd469c24af2e16aad2c2b4fc90fc8c74af36e773.
Diffstat (limited to 'pkgs/os-specific/windows/default.nix')
| -rw-r--r-- | pkgs/os-specific/windows/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix index 7b9bbcc52f791..234abcde16117 100644 --- a/pkgs/os-specific/windows/default.nix +++ b/pkgs/os-specific/windows/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages -, newScope, overrideCC, stdenvNoLibc, libcCross +, newScope, overrideCC, crossLibcStdenv, libcCross }: lib.makeScope newScope (self: with self; { @@ -14,11 +14,11 @@ lib.makeScope newScope (self: with self; { mingw_runtime = mingwrt; mingw_w64 = callPackage ./mingw-w64 { - stdenv = stdenvNoLibc; + stdenv = crossLibcStdenv; }; # FIXME untested with llvmPackages_16 was using llvmPackages_8 - crossThreadsStdenv = overrideCC stdenvNoLibc + crossThreadsStdenv = overrideCC crossLibcStdenv (if stdenv.hostPlatform.useLLVM or false then buildPackages.llvmPackages.clangNoLibcxx else buildPackages.gccWithoutTargetLibc.override (old: { |