nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-04 08:00:59 +01:00
Code Activity

Merge branch 'path-info' into ca-drv-exotic

Browse source
This commit is contained in:
John Ericson 2023-01-23 16:54:45 -05:00
commit e68e8e3cee
63 changed files with 2079 additions and 401 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libstore/build/local-derivation-goal.cc
View file

@ -2484,13 +2484,11 @@ DrvOutputs LocalDerivationGoal::registerOutputs()
auto got = caSink.finish().first;
ValidPathInfo newInfo0 {
worker.store,
{
.name = outputPathName(drv->name, outputName),
.info = contentAddressFromMethodHashAndRefs(
outputHash.method,
std::move(got),
rewriteRefs()),
},
outputPathName(drv->name, outputName),
contentAddressFromMethodHashAndRefs(
outputHash.method,
std::move(got),
rewriteRefs()),
Hash::dummy,
};
if (*scratchPath != newInfo0.path) {

7
src/libstore/build/substitution-goal.cc
View file

@ -95,10 +95,9 @@ void PathSubstitutionGoal::tryNext()
subs.pop_front();
if (ca) {
subPath = sub->makeFixedOutputPathFromCA({
.name = std::string { storePath.name() },
.info = caWithoutRefs(*ca),
});
subPath = sub->makeFixedOutputPathFromCA(
std::string { storePath.name() },
caWithoutRefs(*ca));
if (sub->storeDir == worker.store.storeDir)
assert(subPath == storePath);
} else if (sub->storeDir != worker.store.storeDir) {