From 382aa05ff71b61379f5c2792eaf517bdf4a5c5bf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Sun, 22 Sep 2019 21:53:01 +0200
Subject: nix flake info --json: Get rid of duplicate getFlake() call

Also fix some gcc warnings.
---
 src/nix/flake.cc | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'src/nix/flake.cc')

diff --git a/src/nix/flake.cc b/src/nix/flake.cc
index 2e352306e..d0135143c 100644
--- a/src/nix/flake.cc
+++ b/src/nix/flake.cc
@@ -174,11 +174,12 @@ static void enumerateOutputs(EvalState & state, Value & vFlake,
 {
     state.forceAttrs(vFlake);
 
-    auto vOutputs = (*vFlake.attrs->get(state.symbols.create("outputs")))->value;
+    auto aOutputs = vFlake.attrs->get(state.symbols.create("outputs"));
+    assert(aOutputs);
 
-    state.forceAttrs(*vOutputs);
+    state.forceAttrs(*(*aOutputs)->value);
 
-    for (auto & attr : *vOutputs->attrs)
+    for (auto & attr : *((*aOutputs)->value->attrs))
         callback(attr.name, *attr.value, *attr.pos);
 }
 
@@ -191,15 +192,12 @@ struct CmdFlakeInfo : FlakeCommand, MixJSON
 
     void run(nix::ref<nix::Store> store) override
     {
-        auto flake = getFlake();
-        stopProgressBar();
-
         if (json) {
-            auto json = flakeToJson(flake);
-
             auto state = getEvalState();
             auto flake = resolveFlake();
 
+            auto json = flakeToJson(flake.flake);
+
             auto vFlake = state->allocValue();
             flake::callFlake(*state, flake, *vFlake);
 
@@ -222,8 +220,11 @@ struct CmdFlakeInfo : FlakeCommand, MixJSON
             json["outputs"] = std::move(outputs);
 
             std::cout << json.dump() << std::endl;
-        } else
+        } else {
+            auto flake = getFlake();
+            stopProgressBar();
             printFlakeInfo(flake);
+        }
     }
 };
 
-- 
cgit v1.2.3