mirror of
https://github.com/NixOS/nix.git
synced 2025-11-15 23:12:44 +01:00
Get rid of LocalDerivationGoal
I split it out before to try to separate the building logic, but now we have the much better `DerivationBuilder` abstraction for that. With that change, I think `LocalDerivationGoal` has outlived its usefulness. We just inline it back into `DerivationGoal`, and do so with minimal `#ifdef` for Windows. Note that the order of statements in `~DerivationGoal` is different than it was after the `~LocalDerivationGoal` split, but it is *restored* to the way it original was before --- evidently I did the split slightly wrong, but nobody noticed, probably because the order doesn't actually matter. Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
This commit is contained in:
parent
bebef8f0c4
commit
4e586149df
11 changed files with 198 additions and 331 deletions
|
|
@ -2,7 +2,6 @@ sources += files(
|
|||
'build/child.cc',
|
||||
'build/derivation-builder.cc',
|
||||
'build/hook-instance.cc',
|
||||
'build/local-derivation-goal.cc',
|
||||
'pathlocks.cc',
|
||||
'user-lock.cc',
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue