max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-09-21 08:58:04 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

use InstallableValue::DerivationInfo

Browse source
This commit is contained in:
Max Headroom 2022-03-05 01:25:52 +01:00
parent 397b108e5e
commit 2ba1c12598
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libcmd/installables.cc
View file

@ -539,7 +539,7 @@ std::vector<InstallableValue::DerivationInfo> InstallableAttrPath::toDerivations
DrvInfos drvInfos; DrvInfos drvInfos;
getDerivations(*state, *v, "", autoArgs, drvInfos, false); getDerivations(*state, *v, "", autoArgs, drvInfos, false);
std::vector<DerivationInfo> res; std::vector<InstallableValue::DerivationInfo> res;
for (auto & drvInfo : drvInfos) { for (auto & drvInfo : drvInfos) {
auto drvPath = drvInfo.queryDrvPath(); auto drvPath = drvInfo.queryDrvPath();
if (!drvPath) if (!drvPath)
@ -677,7 +677,7 @@ std::tuple<std::string, FlakeRef, InstallableValue::DerivationInfo> toDerivation
auto drvPath = attr->forceDerivation(); auto drvPath = attr->forceDerivation();
auto drvInfo = DerivationInfo { auto drvInfo = InstallableValue::DerivationInfo {
std::move(drvPath), std::move(drvPath),
attr->getAttr(flake.state->sOutputName)->getString() attr->getAttr(flake.state->sOutputName)->getString()
}; };
@ -713,7 +713,7 @@ std::tuple<std::string, FlakeRef, InstallableValue::DerivationInfo> InstallableF
std::vector<InstallableValue::DerivationInfo> InstallableFlake::toDerivations() std::vector<InstallableValue::DerivationInfo> InstallableFlake::toDerivations()
{ {
std::vector<DerivationInfo> res; std::vector<InstallableValue::DerivationInfo> res;
res.push_back(std::get<2>(toDerivation())); res.push_back(std::get<2>(toDerivation()));
return res; return res;
} }