eisfunke/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #5943 from NixOS/3204-fix-build-with-newer-nlohmann-json

Browse source 
Fix the build with nlohmann/json 3.10.4+
This commit is contained in:
Eelco Dolstra 2022-01-21 11:31:39 +01:00 committed by GitHub
parent c7223db871 e36add56cf
commit accfcfff6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/realisation.cc
View file

@ -78,7 +78,7 @@ Realisation Realisation::fromJSON(
auto fieldIterator = json.find(fieldName); auto fieldIterator = json.find(fieldName);
if (fieldIterator == json.end()) if (fieldIterator == json.end())
return std::nullopt; return std::nullopt;
return *fieldIterator; return {*fieldIterator};
}; };
auto getField = [&](std::string fieldName) -> std::string { auto getField = [&](std::string fieldName) -> std::string {
if (auto field = getOptionalField(fieldName)) if (auto field = getOptionalField(fieldName))