Merge pull request #10850 from NixOS/backport-10549-to-2.20-maintenance

[Backport 2.20-maintenance] Fix exportReferencesGraph when given store subpath
This commit is contained in:
John Ericson 2024-06-04 06:46:39 -04:00 committed by GitHub
commit d3ca72cfd5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -186,7 +186,7 @@ std::optional<nlohmann::json> ParsedDerivation::prepareStructuredAttrs(Store & s
for (auto i = e->begin(); i != e->end(); ++i) { for (auto i = e->begin(); i != e->end(); ++i) {
StorePathSet storePaths; StorePathSet storePaths;
for (auto & p : *i) for (auto & p : *i)
storePaths.insert(store.parseStorePath(p.get<std::string>())); storePaths.insert(store.toStorePath(p.get<std::string>()).first);
json[i.key()] = pathInfoToJSON(store, json[i.key()] = pathInfoToJSON(store,
store.exportReferences(storePaths, inputPaths)); store.exportReferences(storePaths, inputPaths));
} }