diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2023-04-24 13:20:36 +0200 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2023-04-24 13:20:36 +0200 |
commit | 01232358ffd78600d170ca5c1526a7031f6f2762 (patch) | |
tree | babf00196894ec8b79fb963419fe4a6d44e56db4 /src/libstore/build/substitution-goal.cc | |
parent | cb2615cf4735cf28a6e538544c9abbf40cdd24a9 (diff) | |
parent | 7474a90db69813d051ab1bef35c7d0ab958d9ccd (diff) |
Merge remote-tracking branch 'origin/master' into source-path
Diffstat (limited to 'src/libstore/build/substitution-goal.cc')
-rw-r--r-- | src/libstore/build/substitution-goal.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libstore/build/substitution-goal.cc b/src/libstore/build/substitution-goal.cc index 2af105b4d..190fb455a 100644 --- a/src/libstore/build/substitution-goal.cc +++ b/src/libstore/build/substitution-goal.cc @@ -95,7 +95,9 @@ void PathSubstitutionGoal::tryNext() subs.pop_front(); if (ca) { - subPath = sub->makeFixedOutputPathFromCA(storePath.name(), *ca); + subPath = sub->makeFixedOutputPathFromCA( + std::string { storePath.name() }, + ContentAddressWithReferences::withoutRefs(*ca)); if (sub->storeDir == worker.store.storeDir) assert(subPath == storePath); } else if (sub->storeDir != worker.store.storeDir) { |