DerivationBuildingGoal::inputPaths make local variable

Author: Ericson2314

src/libstore/build/derivation-building-goal.cc

@@ -238,6 +238,12 @@ Goal::Co DerivationBuildingGoal::gaveUpOnSubstitution()
 
     /* Determine the full set of input paths. */
 
+    /**
+     * All input paths (that is, the union of FS closures of the
+     * immediate input paths).
+     */
+    StorePathSet inputPaths;
+
     /* First, the input derivations. */
     {
         auto & fullDrv = *drv;
@@ -553,7 +559,7 @@ Goal::Co DerivationBuildingGoal::gaveUpOnSubstitution()
         if (buildLocally) {
             useHook = false;
         } else {
-            switch (tryBuildHook()) {
+            switch (tryBuildHook(inputPaths)) {
             case rpAccept:
                 /* Yes, it has started doing so.  Wait until we get
                    EOF from the hook. */
@@ -957,7 +963,7 @@ BuildError DerivationBuildingGoal::fixupBuilderFailureErrorMessage(BuilderFailur
     return BuildError{e.status, msg};
 }
 
-HookReply DerivationBuildingGoal::tryBuildHook()
+HookReply DerivationBuildingGoal::tryBuildHook(const StorePathSet & inputPaths)
 {
 #ifdef _WIN32 // TODO enable build hook on Windows
     return rpDecline;

src/libstore/include/nix/store/build/derivation-building-goal.hh

@@ -49,12 +49,6 @@ private:
      * The remainder is state held during the build.
      */
 
-    /**
-     * All input paths (that is, the union of FS closures of the
-     * immediate input paths).
-     */
-    StorePathSet inputPaths;
-
     std::map<std::string, InitialOutput> initialOutputs;
 
     /**
@@ -107,7 +101,7 @@ private:
     /**
      * Is the build hook willing to perform the build?
      */
-    HookReply tryBuildHook();
+    HookReply tryBuildHook(const StorePathSet & inputPaths);
 
     /**
      * Open a log file and a pipe to it.