nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-08 19:46:02 +01:00
Code Activity

Fix windows build

Browse source 
I forget to add some CPP in b57caaa1a2.

Hopefully, as we relyon RAII more, these explicit resets become
unneeded.
This commit is contained in:
John Ericson 2025-10-12 13:22:14 -04:00
parent 9150ccb89e
commit 10223fae86
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/build/derivation-building-goal.cc
View file

@ -495,7 +495,9 @@ Goal::Co DerivationBuildingGoal::tryToBuild()
Magenta( Magenta(
"/usr/sbin/softwareupdate --install-rosetta && launchctl stop org.nixos.nix-daemon")); "/usr/sbin/softwareupdate --install-rosetta && launchctl stop org.nixos.nix-daemon"));
#ifndef _WIN32 // TODO enable `DerivationBuilder` on Windows
builder.reset(); builder.reset();
#endif
outputLocks.unlock(); outputLocks.unlock();
worker.permanentFailure = true; worker.permanentFailure = true;
co_return doneFailure({BuildResult::Failure::InputRejected, std::move(msg)}); co_return doneFailure({BuildResult::Failure::InputRejected, std::move(msg)});