Merge remote-tracking branch 'origin/master' into flakes

1 files changed, 9 insertions, 0 deletions

diff --git a/src/libmain/common-args.cc b/src/libmain/common-args.cc
index 51a61f1ca..09f4cd133 100644
--- a/src/libmain/common-args.cc
+++ b/src/libmain/common-args.cc
@@ -1,5 +1,6 @@
 #include "common-args.hh"
 #include "globals.hh"
+#include "loggers.hh"
 
 namespace nix {
 
@@ -49,6 +50,14 @@ MixCommonArgs::MixCommonArgs(const string & programName)
     });
 
     addFlag({
+        .longName = "log-format",
+        .description = "format of log output; \"raw\", \"internal-json\", \"bar\" "
+                        "or \"bar-with-logs\"",
+        .labels = {"format"},
+        .handler = {[](std::string format) { setLogFormat(format); }},
+    });
+
+    addFlag({
         .longName = "max-jobs",
         .shortName = 'j',
         .description = "maximum number of parallel builds",