Move actEvaluate so it doesn't include actLockFlake

2020-11-18 18:19:31 +01:00
parent e6ca275e23
commit 2f512dd29f
1 changed files with 2 additions and 2 deletions
--- 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();