wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 06:31:14 +02:00
Code Activity

builtins.toJSON: fix __toString usage

Browse source
This commit is contained in:
Robin Gloster 2019-10-27 10:15:51 +01:00
parent c0559a1d60
commit e583df5280
No known key found for this signature in database
GPG key ID: D5C458DF6DD97EDF
5 changed files with 29 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libexpr/value-to-json.cc
View file

@ -40,7 +40,12 @@ void printValueAsJSON(EvalState & state, bool strict,
break;
case tAttrs: {
Bindings::iterator i = v.attrs->find(state.sOutPath);
auto maybeString = state.tryAttrsToString(noPos, v, context, false, false);
if (maybeString) {
out.write(*maybeString);
break;
}
auto i = v.attrs->find(state.sOutPath);
if (i == v.attrs->end()) {
auto obj(out.object());
StringSet names;