From f33878b6562c746d5865a86e64f02c75feaf5b3e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 17 Feb 2021 17:11:14 +0100
Subject: [PATCH] Make 'nix --version -vv' work

Fixes #3743.
---
 src/nix/main.cc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/nix/main.cc b/src/nix/main.cc
index ef5e41a55..5f4eb8918 100644
--- a/src/nix/main.cc
+++ b/src/nix/main.cc
@@ -61,6 +61,7 @@ struct NixArgs : virtual MultiCommand, virtual MixCommonArgs
     bool printBuildLogs = false;
     bool useNet = true;
     bool refresh = false;
+    bool showVersion = false;
 
     NixArgs() : MultiCommand(RegisterCommand::getCommandsFor({})), MixCommonArgs("nix")
     {
@@ -87,7 +88,7 @@ struct NixArgs : virtual MultiCommand, virtual MixCommonArgs
         addFlag({
             .longName = "version",
             .description = "Show version information.",
-            .handler = {[&]() { if (!completions) printVersion(programName); }},
+            .handler = {[&]() { showVersion = true; }},
         });
 
         addFlag({
@@ -280,6 +281,11 @@ void mainWrapped(int argc, char * * argv)
 
     initPlugins();
 
+    if (args.showVersion) {
+        printVersion(programName);
+        return;
+    }
+
     if (!args.command)
         throw UsageError("no subcommand specified");