mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-23 14:36:16 +02:00
Reorder to build
This reverts commit 883948d7a0add742ccae58e9845d769a8064371c.
This commit is contained in:
parent
9f4cfbb2e7
commit
73ee1afffe
1 changed files with 21 additions and 21 deletions
|
@ -179,27 +179,6 @@ struct InstallableStorePath : Installable
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
std::vector<InstallableValue::DerivationInfo> InstallableAttrPath::toDerivations()
|
|
||||||
{
|
|
||||||
auto v = toValue(*state).first;
|
|
||||||
|
|
||||||
Bindings & autoArgs = *cmd.getAutoArgs(*state);
|
|
||||||
|
|
||||||
DrvInfos drvInfos;
|
|
||||||
getDerivations(*state, *v, "", autoArgs, drvInfos, false);
|
|
||||||
|
|
||||||
std::vector<DerivationInfo> res;
|
|
||||||
for (auto & drvInfo : drvInfos) {
|
|
||||||
res.push_back({
|
|
||||||
state->store->parseStorePath(drvInfo.queryDrvPath()),
|
|
||||||
state->store->parseStorePath(drvInfo.queryOutPath()),
|
|
||||||
drvInfo.queryOutputName()
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
|
|
||||||
Buildables InstallableValue::toBuildables()
|
Buildables InstallableValue::toBuildables()
|
||||||
{
|
{
|
||||||
Buildables res;
|
Buildables res;
|
||||||
|
@ -255,6 +234,27 @@ struct InstallableAttrPath : InstallableValue
|
||||||
virtual std::vector<InstallableValue::DerivationInfo> toDerivations() override;
|
virtual std::vector<InstallableValue::DerivationInfo> toDerivations() override;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
std::vector<InstallableValue::DerivationInfo> InstallableAttrPath::toDerivations()
|
||||||
|
{
|
||||||
|
auto v = toValue(*state).first;
|
||||||
|
|
||||||
|
Bindings & autoArgs = *cmd.getAutoArgs(*state);
|
||||||
|
|
||||||
|
DrvInfos drvInfos;
|
||||||
|
getDerivations(*state, *v, "", autoArgs, drvInfos, false);
|
||||||
|
|
||||||
|
std::vector<DerivationInfo> res;
|
||||||
|
for (auto & drvInfo : drvInfos) {
|
||||||
|
res.push_back({
|
||||||
|
state->store->parseStorePath(drvInfo.queryDrvPath()),
|
||||||
|
state->store->parseStorePath(drvInfo.queryOutPath()),
|
||||||
|
drvInfo.queryOutputName()
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
std::vector<std::string> InstallableFlake::getActualAttrPaths()
|
std::vector<std::string> InstallableFlake::getActualAttrPaths()
|
||||||
{
|
{
|
||||||
std::vector<std::string> res;
|
std::vector<std::string> res;
|
||||||
|
|
Loading…
Reference in a new issue