1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-11 11:31:03 +01:00

Move primeCache() to Worker::run()

We need the missing path info to communicate the worker's remaining
goals to the progress bar.
This commit is contained in:
Eelco Dolstra 2020-11-18 14:36:15 +01:00
parent 5927624473
commit 3b7e00ce22
4 changed files with 24 additions and 39 deletions

View file

@ -40,9 +40,8 @@ struct InitialOutput {
std::optional<InitialOutputStatus> known;
};
class DerivationGoal : public Goal
struct DerivationGoal : public Goal
{
private:
/* Whether to use an on-disk .drv file. */
bool useDerivation;
@ -246,7 +245,6 @@ private:
friend struct RestrictedStore;
public:
DerivationGoal(const StorePath & drvPath,
const StringSet & wantedOutputs, Worker & worker,
BuildMode buildMode = bmNormal);
@ -264,17 +262,11 @@ public:
void work() override;
StorePath getDrvPath()
{
return drvPath;
}
/* Add wanted outputs to an already existing derivation goal. */
void addWantedOutputs(const StringSet & outputs);
BuildResult getResult() { return result; }
private:
/* The states. */
void getDerivation();
void loadDerivation();
@ -318,8 +310,6 @@ private:
/* Run the builder's process. */
void runChild();
friend int childEntry(void *);
/* Check that the derivation outputs all exist and register them
as valid. */
void registerOutputs();