2 files changed, 8 insertions, 0 deletions
diff --git a/src/libexpr/value-to-json.cc b/src/libexpr/value-to-json.cc
index a2004df5c8c5..d1ec9b566d66 100644
--- a/src/libexpr/value-to-json.cc
+++ b/src/libexpr/value-to-json.cc
@@ -3,6 +3,7 @@
 #include "util.hh"
 
 #include <cstdlib>
+#include <iomanip>
 
 
 namespace nix {
@@ -16,6 +17,8 @@ void escapeJSON(std::ostream & str, const string & s)
         else if (*i == '\n') str << "\\n";
         else if (*i == '\r') str << "\\r";
         else if (*i == '\t') str << "\\t";
+        else if (*i >= 0 && *i < 32)
+            str << "\\u" << std::setfill('0') << std::setw(4) << std::hex << (uint16_t) *i << std::dec;
         else str << *i;
     str << "\"";
 }
diff --git a/src/libexpr/value-to-json.hh b/src/libexpr/value-to-json.hh
index e3a97efe4269..f6796f2053e9 100644
--- a/src/libexpr/value-to-json.hh
+++ b/src/libexpr/value-to-json.hh
@@ -36,6 +36,11 @@ struct JSONObject
         attr(s);
         escapeJSON(str, t);
     }
+    void attr(const string & s, int n)
+    {
+        attr(s);
+        str << n;
+    }
 };
 
 struct JSONList