From 7c1e5b3345b2e0a95b1a04b65ddcb6350be2e86a Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 29 Aug 2025 14:02:01 -0400
Subject: [PATCH] In `DerivationBuildingGoal` Demote `actLock` to local
 variable

It doesn't need to be a field any more, because we just use it with two
loops.
---
 src/libstore/build/derivation-building-goal.cc               | 5 +++++
 .../include/nix/store/build/derivation-building-goal.hh      | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/libstore/build/derivation-building-goal.cc b/src/libstore/build/derivation-building-goal.cc
index 77ab23b4c..fd85a066d 100644
--- a/src/libstore/build/derivation-building-goal.cc
+++ b/src/libstore/build/derivation-building-goal.cc
@@ -470,6 +470,11 @@ void DerivationBuildingGoal::started()
 
 Goal::Co DerivationBuildingGoal::tryToBuild()
 {
+    /**
+     * Activity that denotes waiting for a lock.
+     */
+    std::unique_ptr<Activity> actLock;
+
     bool useHook;
 
     while (true) {
diff --git a/src/libstore/include/nix/store/build/derivation-building-goal.hh b/src/libstore/include/nix/store/build/derivation-building-goal.hh
index 162cf14ad..dd8b27dc2 100644
--- a/src/libstore/include/nix/store/build/derivation-building-goal.hh
+++ b/src/libstore/include/nix/store/build/derivation-building-goal.hh
@@ -92,11 +92,6 @@ struct DerivationBuildingGoal : public Goal
 
     std::unique_ptr<Activity> act;
 
-    /**
-     * Activity that denotes waiting for a lock.
-     */
-    std::unique_ptr<Activity> actLock;
-
     std::map<ActivityId, Activity> builderActivities;
 
     /**