Write a destructor for DerivationBuilderImpl

This allows `DerivationBuildingGoal` to know less.

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

@@ -59,18 +59,8 @@ DerivationBuildingGoal::~DerivationBuildingGoal()
         ignoreExceptionInDestructor();
     }
 #ifndef _WIN32 // TODO enable `DerivationBuilder` on Windows
-    if (builder) {
+    if (builder)
-        try {
+        builder.reset();
-            builder->stopDaemon();
-        } catch (...) {
-            ignoreExceptionInDestructor();
-        }
-        try {
-            builder->cleanupBuild(false);
-        } catch (...) {
-            ignoreExceptionInDestructor();
-        }
-    }
 #endif
     try {
         closeLogFile();

src/libstore/include/nix/store/build/derivation-builder.hh

@@ -192,20 +192,6 @@ struct DerivationBuilder : RestrictionContext
      */
     virtual SingleDrvOutputs unprepareBuild() = 0;
 
-    /**
-     * Stop the in-process nix daemon thread.
-     * @see startDaemon
-     */
-    virtual void stopDaemon() = 0;
-
-    /**
-     * Delete the temporary directory, if we have one.
-     *
-     * @param force We know the build suceeded, so don't attempt to
-     * preseve anything for debugging.
-     */
-    virtual void cleanupBuild(bool force) = 0;
-
     /**
      * Kill any processes running under the build user UID or in the
      * cgroup of the build.

src/libstore/unix/build/derivation-builder.cc

@@ -85,6 +85,22 @@ public:
     {
     }
 
+    ~DerivationBuilderImpl()
+    {
+        /* Careful: we should never ever throw an exception from a
+           destructor. */
+        try {
+            stopDaemon();
+        } catch (...) {
+            ignoreExceptionInDestructor();
+        }
+        try {
+            cleanupBuild(false);
+        } catch (...) {
+            ignoreExceptionInDestructor();
+        }
+    }
+
 protected:
 
     /**
@@ -285,9 +301,11 @@ private:
      */
     void startDaemon();
 
-public:
+    /**
-
+     * Stop the in-process nix daemon thread.
-    void stopDaemon() override;
+     * @see startDaemon
+     */
+    void stopDaemon();
 
 protected:
 
@@ -342,9 +360,17 @@ private:
      */
     SingleDrvOutputs registerOutputs();
 
-public:
+protected:
 
-    void cleanupBuild(bool force) override;
+    /**
+     * Delete the temporary directory, if we have one.
+     *
+     * @param force We know the build suceeded, so don't attempt to
+     * preseve anything for debugging.
+     */
+    virtual void cleanupBuild(bool force);
+
+public:
 
     void killSandbox(bool getStats) override;