aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/globals.cc
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2020-08-20 11:02:16 +0200
committerEelco Dolstra <edolstra@gmail.com>2020-08-20 11:02:16 +0200
commitacb99f03f963d00670e5a286c76a92d022ef44b0 (patch)
tree0276724f5b1709e750af90ed1f19e2e121c0b8eb /src/libstore/globals.cc
parentb4ef3d7078133d6c31c77da45a991bfe2210623a (diff)
Config: Use nlohmann/json
Diffstat (limited to 'src/libstore/globals.cc')
-rw-r--r--src/libstore/globals.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
index 683fa5196..4a5971c3f 100644
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@@ -9,6 +9,8 @@
#include <dlfcn.h>
#include <sys/utsname.h>
+#include <nlohmann/json.hpp>
+
namespace nix {
@@ -160,9 +162,9 @@ template<> std::string BaseSetting<SandboxMode>::to_string() const
else abort();
}
-template<> void BaseSetting<SandboxMode>::toJSON(JSONPlaceholder & out)
+template<> nlohmann::json BaseSetting<SandboxMode>::toJSON()
{
- AbstractSetting::toJSON(out);
+ return AbstractSetting::toJSON();
}
template<> void BaseSetting<SandboxMode>::convertToArg(Args & args, const std::string & category)