Fix NixOS#13293

We move the `assertPathValidity` to where we know what the wanted
outputs are.

Author: Ericson2314

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

@@ -613,9 +613,6 @@ Goal::Co DerivationBuildingGoal::tryToBuild()
                 void closeLogFile() override {
                     goal.closeLogFile();
                 }
-                SingleDrvOutputs assertPathValidity() override {
-                    return goal.assertPathValidity();
-                }
                 void appendLogTailErrorMsg(std::string & msg) override {
                     goal.appendLogTailErrorMsg(msg);
                 }

src/libstore/build/derivation-goal.cc

@@ -210,6 +210,13 @@ Goal::Co DerivationGoal::haveDerivation(StorePath drvPath)
             .outputs = wantedOutputs,
         });
 
+        if (buildMode == bmCheck) {
+            /* In checking mode, the builder will not register any outputs.
+               So we want to make sure the ones that we wanted to repair are
+               properly there. */
+            buildResult.builtOutputs = assertPathValidity(drvPath);
+        }
+
         co_return amDone(g->exitCode, g->ex);
     };
 

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

@@ -589,10 +589,10 @@ static void replaceValidPath(const Path & storePath, const Path & tmpPath)
        way first.  We'd better not be interrupted here, because if
        we're repairing (say) Glibc, we end up with a broken system. */
     Path oldPath;
-    
+
     if (pathExists(storePath)) {
         // why do we loop here?
-        // although makeTempPath should be unique, we can't 
+        // although makeTempPath should be unique, we can't
         // guarantee that.
         do {
             oldPath = makeTempPath(storePath, ".old");
@@ -1871,7 +1871,7 @@ SingleDrvOutputs DerivationBuilderImpl::registerOutputs()
            also a source for non-determinism. */
         if (delayedException)
             std::rethrow_exception(delayedException);
-        return miscMethods->assertPathValidity();
+        return {};
     }
 
     /* Apply output checks. */

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

@@ -97,14 +97,6 @@ struct DerivationBuilderCallbacks
      */
     virtual void closeLogFile() = 0;
 
-    /**
-     * Aborts if any output is not valid or corrupt, and otherwise
-     * returns a 'SingleDrvOutputs' structure containing all outputs.
-     *
-     * @todo Probably should just be in `DerivationGoal`.
-     */
-    virtual SingleDrvOutputs assertPathValidity() = 0;
-
     virtual void appendLogTailErrorMsg(std::string & msg) = 0;
 
     /**