mirror of
https://github.com/NixOS/nix.git
synced 2025-12-24 09:50:55 +01:00
Merge pull request #14228 from obsidiansystems/fix-windows-build
Fix windows build
This commit is contained in:
commit
4f585dedbe
2 changed files with 13 additions and 19 deletions
|
|
@ -495,7 +495,9 @@ Goal::Co DerivationBuildingGoal::tryToBuild()
|
|||
Magenta(
|
||||
"/usr/sbin/softwareupdate --install-rosetta && launchctl stop org.nixos.nix-daemon"));
|
||||
|
||||
#ifndef _WIN32 // TODO enable `DerivationBuilder` on Windows
|
||||
builder.reset();
|
||||
#endif
|
||||
outputLocks.unlock();
|
||||
worker.permanentFailure = true;
|
||||
co_return doneFailure({BuildResult::Failure::InputRejected, std::move(msg)});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue