From 2f512dd29f662ecb08bb256e79525f05fd4a6ed0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 18 Nov 2020 18:19:31 +0100
Subject: [PATCH] Move actEvaluate so it doesn't include actLockFlake

---
 src/nix/installables.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nix/installables.cc b/src/nix/installables.cc
index 202b08c80..a06aab504 100644
--- a/src/nix/installables.cc
+++ b/src/nix/installables.cc
@@ -356,8 +356,6 @@ struct InstallableStorePath : Installable
 
 Buildables InstallableValue::toBuildables()
 {
-    Activity act(*logger, lvlInfo, actEvaluate);
-
     Buildables res;
 
     std::map<StorePath, std::map<std::string, std::optional<StorePath>>> drvsToOutputs;
@@ -489,6 +487,8 @@ std::tuple<std::string, FlakeRef, InstallableValue::DerivationInfo> InstallableF
 {
     auto lockedFlake = getLockedFlake();
 
+    Activity act(*logger, lvlInfo, actEvaluate);
+
     auto cache = openEvalCache(*state, lockedFlake);
     auto root = cache->getRoot();