nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-16 15:32:43 +01:00
Code Activity

DerivationBuilder no more callback soup for logging

Browse source 
`startBuilder` just returns the descriptor for the pipe now.
This commit is contained in:
John Ericson 2025-09-03 17:33:48 -04:00
parent 7f3314a68c
commit 14c206f05a
3 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/unix/build/derivation-builder.cc
View file

@ -216,7 +216,7 @@ public:
bool prepareBuild() override;
void startBuilder() override;
Descriptor startBuilder() override;
SingleDrvOutputs unprepareBuild() override;
@ -679,7 +679,7 @@ static bool checkNotWorldWritable(std::filesystem::path path)
return true;
}
void DerivationBuilderImpl::startBuilder()
Descriptor DerivationBuilderImpl::startBuilder()
{
/* Make sure that no other processes are executing under the
sandbox uids. This must be done before any chownToBuilder()
@ -841,9 +841,10 @@ void DerivationBuilderImpl::startBuilder()
startChild();
pid.setSeparatePG(true);
miscMethods->childStarted(builderOut.get());
processSandboxSetupMessages();
return builderOut.get();
}
PathsInChroot DerivationBuilderImpl::getPathsInSandbox()