1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-24 22:11:15 +02:00

Remove buildUser from DerivationBuilder

The use of a `buildUser` is an implementation detail of some types of
sandboxes that shouldn't exposed.
This commit is contained in:
Eelco Dolstra 2025-05-26 15:53:05 +02:00
parent ed3e2a71ea
commit 69914e4b3c
3 changed files with 7 additions and 7 deletions

View file

@ -655,8 +655,8 @@ Goal::Co DerivationBuildingGoal::tryToBuild()
builder->startBuilder();
} catch (BuildError & e) {
builder.reset();
outputLocks.unlock();
builder->buildUser.reset();
worker.permanentFailure = true;
co_return done(BuildResult::InputRejected, {}, std::move(e));
}

View file

@ -106,6 +106,11 @@ public:
private:
/**
* User selected for running the builder.
*/
std::unique_ptr<UserLock> buildUser;
/**
* The cgroup of the builder, if any.
*/
@ -264,7 +269,7 @@ public:
/**
* Start building a derivation.
*/
void startBuilder() override;;
void startBuilder() override;
/**
* Tear down build environment after the builder exits (either on

View file

@ -138,11 +138,6 @@ struct DerivationBuilderCallbacks
*/
struct DerivationBuilder : RestrictionContext
{
/**
* User selected for running the builder.
*/
std::unique_ptr<UserLock> buildUser;
/**
* The process ID of the builder.
*/