From ed5593700260edcd6882e5c713670252e920cbe2 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 9 Jul 2025 17:15:32 -0400
Subject: [PATCH] Make many members of `DerivationGoal` private

---
 .../nix/store/build/derivation-goal.hh        | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/libstore/include/nix/store/build/derivation-goal.hh b/src/libstore/include/nix/store/build/derivation-goal.hh
index 5d5c8d131..4b004e73b 100644
--- a/src/libstore/include/nix/store/build/derivation-goal.hh
+++ b/src/libstore/include/nix/store/build/derivation-goal.hh
@@ -43,21 +43,6 @@ struct DerivationGoal : public Goal
      */
     OutputName wantedOutput;
 
-    /**
-     * The derivation stored at drvPath.
-     */
-    std::unique_ptr<Derivation> drv;
-
-    /**
-     * The remainder is state held during the build.
-     */
-
-    std::map<std::string, InitialOutput> initialOutputs;
-
-    BuildMode buildMode;
-
-    std::unique_ptr<MaintainCount<uint64_t>> mcExpectedBuilds;
-
     DerivationGoal(
         const StorePath & drvPath,
         const Derivation & drv,
@@ -73,6 +58,28 @@ struct DerivationGoal : public Goal
 
     std::string key() override;
 
+    JobCategory jobCategory() const override
+    {
+        return JobCategory::Administration;
+    };
+
+private:
+
+    /**
+     * The derivation stored at drvPath.
+     */
+    std::unique_ptr<Derivation> drv;
+
+    /**
+     * The remainder is state held during the build.
+     */
+
+    std::map<std::string, InitialOutput> initialOutputs;
+
+    BuildMode buildMode;
+
+    std::unique_ptr<MaintainCount<uint64_t>> mcExpectedBuilds;
+
     /**
      * The states.
      */
@@ -95,11 +102,6 @@ struct DerivationGoal : public Goal
     Co repairClosure();
 
     Done done(BuildResult::Status status, SingleDrvOutputs builtOutputs = {}, std::optional<Error> ex = {});
-
-    JobCategory jobCategory() const override
-    {
-        return JobCategory::Administration;
-    };
 };
 
 } // namespace nix