diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2023-04-17 15:49:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-17 15:49:48 +0200 |
| commit | e641de085b625e56b723f45e8355deaa01ea3a1a (patch) | |
| tree | c776b4726529a29748a9f03e5009fe0911d30f86 /src/libstore/derivations.cc | |
| parent | 72ffa7fedb34585948f8c9a47bfaebeb6cc5d537 (diff) | |
| parent | 537e8719f2ca8e18312bd8dcc37124fb1b25d4d3 (diff) | |
Merge pull request #3746 from obsidiansystems/path-info
Introduce `StoreReferences` and `ContentAddressWithReferences`
Diffstat (limited to 'src/libstore/derivations.cc')
| -rw-r--r-- | src/libstore/derivations.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc index 7eb5cd275..0de36504b 100644 --- a/src/libstore/derivations.cc +++ b/src/libstore/derivations.cc @@ -36,8 +36,8 @@ std::optional<StorePath> DerivationOutput::path(const Store & store, std::string StorePath DerivationOutput::CAFixed::path(const Store & store, std::string_view drvName, std::string_view outputName) const { return store.makeFixedOutputPath( - hash.method, hash.hash, - outputPathName(drvName, outputName)); + outputPathName(drvName, outputName), + { hash, {} }); } @@ -942,7 +942,7 @@ void Derivation::checkInvariants(Store & store, const StorePath & drvPath) const envHasRightPath(doia.path, i.first); }, [&](const DerivationOutput::CAFixed & dof) { - StorePath path = store.makeFixedOutputPath(dof.hash.method, dof.hash.hash, drvName); + StorePath path = store.makeFixedOutputPath(drvName, { dof.hash, {} }); envHasRightPath(path, i.first); }, [&](const DerivationOutput::CAFloating &) { |