Merge remote-tracking branch 'nixos/master' into pr-flake-show-foreign

1 files changed, 4 insertions, 5 deletions

diff --git a/src/nix/eval.cc b/src/nix/eval.cc
index ddd2790c6..ccee074e9 100644
--- a/src/nix/eval.cc
+++ b/src/nix/eval.cc
@@ -4,10 +4,11 @@
 #include "store-api.hh"
 #include "eval.hh"
 #include "eval-inline.hh"
-#include "json.hh"
 #include "value-to-json.hh"
 #include "progress-bar.hh"
 
+#include <nlohmann/json.hpp>
+
 using namespace nix;
 
 struct CmdEval : MixJSON, InstallableCommand
@@ -111,13 +112,11 @@ struct CmdEval : MixJSON, InstallableCommand
 
         else if (raw) {
             stopProgressBar();
-            std::cout << *state->coerceToString(noPos, *v, context);
+            std::cout << *state->coerceToString(noPos, *v, context, "while generating the eval command output");
         }
 
         else if (json) {
-            JSONPlaceholder jsonOut(std::cout);
-            printValueAsJSON(*state, true, *v, pos, jsonOut, context, false);
-            std::cout << std::endl;
+            std::cout << printValueAsJSON(*state, true, *v, pos, context, false).dump() << std::endl;
         }
 
         else {