nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-25 08:12:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Another attempt at caching nix build

Browse Source 
A different tradeof set probably. I guess we could unify both
This commit is contained in:
regnat 2021-06-04 11:43:59 +02:00
parent 3e261410bc
commit c116e6e837
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/libcmd/installables.cc
View File

@ -499,36 +499,39 @@ std::tuple<std::string, FlakeRef, InstallableValue::DerivationInfo> InstallableF
for (auto & attrPath : getActualAttrPaths()) {
auto emptyArgs = state->allocBindings(0);
auto drvPathAttrPath = attrPath + ".drvPath";
auto drvOutputNameAttrPath = attrPath + ".outputName";
auto drvOutputPathAttrPath = attrPath + ".outPath";
try {
auto [drvPathValue, pos] = findAlongAttrPath(
auto [drvValue, pos] = findAlongAttrPath(
*state,
drvPathAttrPath,
attrPath,
*emptyArgs,
*getFlakeOutputs(*state, *lockedFlake)
);
auto drvPath = state->forceString(*drvPathValue);
auto drvOutputNameValue = findAlongAttrPath(
*state,
drvOutputNameAttrPath,
*emptyArgs,
*getFlakeOutputs(*state, *lockedFlake)
).first;
auto drvOutputName = state->forceString(*drvOutputNameValue);
auto drvOutputPathValue = findAlongAttrPath(
*state,
drvOutputPathAttrPath,
*emptyArgs,
*getFlakeOutputs(*state, *lockedFlake)
).first;
auto drvOutputPath = state->forceString(*drvOutputPathValue);
auto drvPath = state->forceString(
*findAlongAttrPath(
*state,
"drvPath",
*emptyArgs,
*drvValue).first
);
auto outPath = state->forceString(
*findAlongAttrPath(
*state,
"outPath",
*emptyArgs,
*drvValue).first
);
auto outputName = state->forceString(
*findAlongAttrPath(
*state,
"outputName",
*emptyArgs,
*drvValue).first
);
auto drvInfo = DerivationInfo{
state->store->parseStorePath(drvPath),
state->store->maybeParseStorePath(drvOutputPath), // FIXME: set to something when relevant?
drvOutputName
state->store->maybeParseStorePath(outPath), // FIXME: set to something when relevant?
outputName
};
return {attrPath, lockedFlake->flake.lockedRef, std::move(drvInfo)};