diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-09-03 15:43:17 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-09-03 15:43:17 +0000 |
| commit | e7d93e7ece8fd6906e45d0ea21fa08e00b815ca8 (patch) | |
| tree | cab29687872b29cec9306d04dafbee4e1ee7cf95 /src/libexpr | |
| parent | ef278d00f92cddba48a463a38107276b029dd66b (diff) | |
| parent | 8a945d6ddb0676b454458e6fe0e9ea6f8b4b5659 (diff) | |
Merge remote-tracking branch 'upstream/master' into single-ca-drv-build
Diffstat (limited to 'src/libexpr')
| -rw-r--r-- | src/libexpr/eval-cache.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libexpr/eval-cache.cc b/src/libexpr/eval-cache.cc index 46177a0a4..381344b40 100644 --- a/src/libexpr/eval-cache.cc +++ b/src/libexpr/eval-cache.cc @@ -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) |