guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into single-ca-drv-build

Browse Source
This commit is contained in:
John Ericson
2020-09-03 15:43:17 +00:00
parent ef278d00f9 8a945d6ddb
commit e7d93e7ece
20 changed files with 55 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libexpr/eval-cache.cc
+2 -1
View File
@@ -391,7 +391,8 @@ Value & AttrCursor::forceValue()
if (root->db && (!cachedValue || std::get_if<placeholder_t>(&cachedValue->second))) {
if (v.type == tString)
cachedValue = {root->db->setString(getKey(), v.string.s, v.string.context), v.string.s};
cachedValue = {root->db->setString(getKey(), v.string.s, v.string.context),
string_t{v.string.s, {}}};
else if (v.type == tPath)
cachedValue = {root->db->setString(getKey(), v.path), v.path};
else if (v.type == tBool)