Make DerivationBuilder not require a Store

The hope is to make `DerivationBuilder` easier to use with much less of
libnixstore.

Author: Ericson2314

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

@@ -2,6 +2,7 @@
 #include "build/derivation-check.hh"
 #include "nix/store/globals.hh"
 #include "nix/store/local-store.hh"
+#include "nix/store/restricted-store.hh"
 #include "nix/store/path-references.hh"
 #include "nix/store/posix-fs-canonicalise.hh"
 #include "nix/util/archive.hh"
@@ -100,7 +101,7 @@ static void replaceValidPath(const std::filesystem::path & storePath, const std:
         deletePath(oldPath);
 }
 
-SingleDrvOutputs DerivationBuilderImpl::registerOutputs()
+SingleDrvOutputs DerivationBuilderImpl::registerOutputs(LocalStore & localStore)
 {
     std::map<std::string, ValidPathInfo> infos;
 
@@ -326,7 +327,7 @@ SingleDrvOutputs DerivationBuilderImpl::registerOutputs()
                 /* Put the temporary copy in a directory inaccessible to the builder.
                    actualPath might point inside the build chroot, which is controlled
                    by the derivation builder. */
-                auto [rewriteTempDir, rewriteTempDirFd] = store.createTempDirInStore();
+                auto [rewriteTempDir, rewriteTempDirFd] = localStore.createTempDirInStore();
                 AutoDelete delRewriteTempDir(rewriteTempDir);
                 std::filesystem::path tmpPath = rewriteTempDir / "x";
                 restorePath(tmpPath, *source);
@@ -410,7 +411,7 @@ SingleDrvOutputs DerivationBuilderImpl::registerOutputs()
             }();
 
             auto newInfo0 = ValidPathInfo::makeFromCA(
-                store,
+                storeDirConfig,
                 outputPathName(drv.name, outputName),
                 ContentAddressWithReferences::fromParts(outputHash.method, std::move(got), rewriteRefs()),
                 Hash::dummy);
@@ -438,15 +439,15 @@ SingleDrvOutputs DerivationBuilderImpl::registerOutputs()
 
         auto moveOutputToTempDir = [&]() -> void {
             std::filesystem::path tempDir;
-            std::tie(tempDir, tempDirFd) = store.createTempDirInStore();
+            std::tie(tempDir, tempDirFd) = localStore.createTempDirInStore();
             delTempDir = AutoDelete(tempDir);
 
             auto tmpOutput = tempDir / "x";
 
             /* Copy files to break stale file descriptors. copyRecursive below will use
                reflinking to optimise the copying overhead. */
             auto pathAccessor = makeFSSourceAccessor(actualPath);
-            RestoreSink restoreSink{store.config->getLocalSettings().fsyncStorePaths};
+            RestoreSink restoreSink{store->getLocalSettings().fsyncStorePaths};
             restoreSink.dstPath = tmpOutput;
             copyRecursive(*pathAccessor, CanonPath::root, restoreSink, CanonPath::root);
             /* This makes it slightly harder to make sense of the control flow. The rule
@@ -471,7 +472,7 @@ SingleDrvOutputs DerivationBuilderImpl::registerOutputs()
                         {makeFSSourceAccessor(actualPath), CanonPath::root},
                         FileSerialisationMethod::NixArchive,
                         HashAlgorithm::SHA256);
-                    ValidPathInfo newInfo0{requiredFinalPath, {store, narHashAndSize.hash}};
+                    ValidPathInfo newInfo0{requiredFinalPath, {storeDirConfig, narHashAndSize.hash}};
                     newInfo0.narSize = narHashAndSize.numBytesDigested;
                     auto refs = rewriteRefs();
                     newInfo0.references = std::move(refs.others);
@@ -532,44 +533,44 @@ SingleDrvOutputs DerivationBuilderImpl::registerOutputs()
            derivations. */
         PathLocks dynamicOutputLock;
         dynamicOutputLock.setDeletion(true);
-        auto optFixedPath = output->path(store, drv.name, outputName);
+        auto optFixedPath = output->path(storeDirConfig, drv.name, outputName);
         if (!optFixedPath || storeDirConfig.printStorePath(*optFixedPath) != finalDestPath) {
             assert(newInfo.ca);
 
             /* Don't wait on lock for the hash-mismatching fixed-output
                derivation case, to avoid a deadlock in the case where a build
                with the correct hash is in progress. */
-            bool locked = dynamicOutputLock.lockPaths({store.toRealPath(newInfo.path)}, "", !optFixedPath);
+            bool locked = dynamicOutputLock.lockPaths({store->toRealPath(newInfo.path)}, "", !optFixedPath);
 
             /* If we can't lock the correct path, clean up and bail now. */
             if (!locked) {
                 debug(
                     "failed to lock correct output path of %s, namely %s, not moving output",
                     storeDirConfig.printStorePath(drvPath),
-                    PathFmt(store.toRealPath(newInfo.path)));
+                    PathFmt(store->toRealPath(newInfo.path)));
                 deletePath(actualPath);
                 /* Trigger the hash-mismatch error. */
-                checkCAOutput(store, drvPath, *output, newInfo, outputName);
+                checkCAOutput(storeDirConfig, drvPath, *output, newInfo, outputName);
                 unreachable();
             }
         }
 
         /* Move files, if needed */
-        if (store.toRealPath(newInfo.path) != actualPath) {
+        if (store->toRealPath(newInfo.path) != actualPath) {
             if (buildMode == bmRepair) {
                 /* Path already exists, need to replace it */
-                replaceValidPath(store.toRealPath(newInfo.path), actualPath);
+                replaceValidPath(store->toRealPath(newInfo.path), actualPath);
             } else if (buildMode == bmCheck) {
                 /* Path already exists, and we want to compare, so we leave out
                    new path in place. */
-            } else if (store.isValidPath(newInfo.path)) {
+            } else if (localStore.isValidPath(newInfo.path)) {
                 /* Path already exists because CA path produced by something
                    else. No moving needed. */
                 assert(newInfo.ca);
                 /* Can delete our scratch copy now. */
                 deletePath(actualPath);
             } else {
-                auto destPath = store.toRealPath(newInfo.path);
+                auto destPath = store->toRealPath(newInfo.path);
                 deletePath(destPath);
                 movePath(actualPath, destPath);
             }
@@ -578,12 +579,12 @@ SingleDrvOutputs DerivationBuilderImpl::registerOutputs()
         if (buildMode == bmCheck) {
             /* Check against already registered outputs */
 
-            if (store.isValidPath(newInfo.path)) {
-                ValidPathInfo oldInfo(*store.queryPathInfo(newInfo.path));
+            if (localStore.isValidPath(newInfo.path)) {
+                ValidPathInfo oldInfo(*localStore.queryPathInfo(newInfo.path));
                 if (newInfo.narHash != oldInfo.narHash) {
                     auto * diffHook = localSettings.getDiffHook();
                     if (diffHook || settings.keepFailed) {
-                        auto dst = store.toRealPath(newInfo.path);
+                        auto dst = store->toRealPath(newInfo.path);
                         dst += ".check";
                         deletePath(dst);
                         movePath(actualPath, dst);
@@ -604,20 +605,20 @@ SingleDrvOutputs DerivationBuilderImpl::registerOutputs()
                         throw NotDeterministic(
                             "derivation '%s' may not be deterministic: output %s differs from %s",
                             storeDirConfig.printStorePath(drvPath),
-                            PathFmt(store.toRealPath(newInfo.path)),
+                            PathFmt(store->toRealPath(newInfo.path)),
                             PathFmt(dst));
                     } else
                         throw NotDeterministic(
                             "derivation '%s' may not be deterministic: output %s differs",
                             storeDirConfig.printStorePath(drvPath),
-                            PathFmt(store.toRealPath(newInfo.path)));
+                            PathFmt(store->toRealPath(newInfo.path)));
                 }
 
                 /* Since we verified the build, it's now ultimately trusted. */
                 if (!oldInfo.ultimate) {
                     oldInfo.ultimate = true;
-                    store.signPathInfo(oldInfo);
-                    store.registerValidPaths({{oldInfo.path, oldInfo}});
+                    localStore.signPathInfo(oldInfo);
+                    localStore.registerValidPaths({{oldInfo.path, oldInfo}});
                 }
             }
         } else {
@@ -631,12 +632,13 @@ SingleDrvOutputs DerivationBuilderImpl::registerOutputs()
                     debug("unreferenced input: '%1%'", storeDirConfig.printStorePath(i));
             }
 
-            if (!store.isValidPath(newInfo.path))
-                store.optimisePath(store.toRealPath(newInfo.path), NoRepair); // FIXME: combine with scanForReferences()
+            if (!localStore.isValidPath(newInfo.path))
+                localStore.optimisePath(
+                    store->toRealPath(newInfo.path), NoRepair); // FIXME: combine with scanForReferences()
 
             newInfo.deriver = drvPath;
             newInfo.ultimate = true;
-            store.signPathInfo(newInfo);
+            localStore.signPathInfo(newInfo);
 
             finish(newInfo.path);
 
@@ -651,7 +653,7 @@ SingleDrvOutputs DerivationBuilderImpl::registerOutputs()
                possibly quite slow thing it was) doesn't have to be done
                again. */
             if (newInfo.ca)
-                store.registerValidPaths({{newInfo.path, newInfo}});
+                localStore.registerValidPaths({{newInfo.path, newInfo}});
         }
 
         /* Do this in both the check and non-check cases, because we
@@ -662,7 +664,7 @@ SingleDrvOutputs DerivationBuilderImpl::registerOutputs()
 
     /* Apply output checks. This includes checking of the wanted vs got
        hash of fixed-outputs. */
-    checkOutputs(store, drvPath, drv, drvOptions.outputChecks, infos);
+    checkOutputs(localStore, drvPath, drv, drvOptions.outputChecks, infos);
 
     if (buildMode == bmCheck) {
         return {};
@@ -676,7 +678,7 @@ SingleDrvOutputs DerivationBuilderImpl::registerOutputs()
         for (auto & [outputName, newInfo] : infos) {
             infos2.insert_or_assign(newInfo.path, newInfo);
         }
-        store.registerValidPaths(infos2);
+        localStore.registerValidPaths(infos2);
     }
 
     /* If we made it this far, we are sure the output matches the
@@ -699,13 +701,64 @@ SingleDrvOutputs DerivationBuilderImpl::registerOutputs()
             },
         };
         if (experimentalFeatureSettings.isEnabled(Xp::CaDerivations) && !type(drv).isImpure()) {
-            store.signRealisation(thisRealisation);
-            store.registerDrvOutput(thisRealisation, NoCheckSigs);
+            localStore.signRealisation(thisRealisation);
+            localStore.registerDrvOutput(thisRealisation, NoCheckSigs);
         }
         builtOutputs.emplace(outputName, thisRealisation);
     }
 
     return builtOutputs;
 }
 
+BuildingStore::~BuildingStore() = default;
+
+namespace {
+
+struct LocalBuildingStore : BuildingStore
+{
+    LocalStore & localStore;
+
+    LocalBuildingStore(LocalStore & localStore)
+        : BuildingStore{localStore.storeDir}
+        , localStore{localStore}
+    {
+    }
+
+    std::filesystem::path getRealStoreDir() const override
+    {
+        return localStore.config->realStoreDir.get();
+    }
+
+    std::filesystem::path getBuildDir() const override
+    {
+        return localStore.config->getBuildDir();
+    }
+
+    const LocalSettings & getLocalSettings() const override
+    {
+        return localStore.config->getLocalSettings();
+    }
+
+    ref<Store> makeRecursiveNixStore(RestrictionContext & ctx) override
+    {
+        return makeRestrictedStore(
+            [&] {
+                auto config = make_ref<LocalStore::Config>(*localStore.config);
+                config->pathInfoCacheSize = 0;
+                config->stateDir = "/no-such-path";
+                config->logDir = "/no-such-path";
+                return config;
+            }(),
+            ref<LocalStore>(std::dynamic_pointer_cast<LocalStore>(localStore.shared_from_this())),
+            ctx);
+    }
+};
+
+} // namespace
+
+std::unique_ptr<BuildingStore> makeBuildingStoreFromLocalStore(LocalStore & localStore)
+{
+    return std::make_unique<LocalBuildingStore>(localStore);
+}
+
 } // namespace nix

src/libstore/build/derivation-builder-impl.hh

@@ -35,7 +35,7 @@ protected:
      */
     Pid pid;
 
-    LocalStore & store;
+    std::unique_ptr<BuildingStore> store;
 
     /**
      * Just the store layout, for FFI: a `StoreDirConfig` can be made
@@ -57,7 +57,7 @@ protected:
      */
     const derivation::Type derivationType;
 
-    const LocalSettings & localSettings = store.config->getLocalSettings();
+    const LocalSettings & localSettings = store->getLocalSettings();
 
 #ifndef _WIN32
     /**
@@ -97,25 +97,27 @@ protected:
      */
     virtual std::filesystem::path realPathInHost(const std::filesystem::path & p)
     {
-        return store.toRealPath(storeDirConfig.parseStorePath(p.string()));
+        return store->toRealPath(storeDirConfig.parseStorePath(p.string()));
     }
 
 
 public:
 
     DerivationBuilderImpl(
-        LocalStore & store, std::shared_ptr<DerivationBuilderCallbacks> miscMethods, DerivationBuilderParams params)
+        std::unique_ptr<BuildingStore> store,
+        std::shared_ptr<DerivationBuilderCallbacks> miscMethods,
+        DerivationBuilderParams params)
         : DerivationBuilderParams{std::move(params)}
-        , store{store}
-        , storeDirConfig{*store.config}
+        , store{std::move(store)}
+        , storeDirConfig{*this->store}
         , miscMethods{std::move(miscMethods)}
         , derivationType{derivation::type(drv)}
     {
     }
 
 public:
 
-    SingleDrvOutputs registerOutputs() override;
+    SingleDrvOutputs registerOutputs(LocalStore & localStore) override;
 };
 
 } // namespace nix

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

@@ -967,13 +967,13 @@ Goal::Co DerivationBuildingGoal::buildLocally(
                           throw UnimplementedError("external builders are not yet supported on Windows")
 #else
                           makeExternalDerivationBuilder(
-                              localBuildCap.localStore,
+                              makeBuildingStoreFromLocalStore(localBuildCap.localStore),
                               std::make_shared<DerivationBuildingGoalCallbacks>(*this, openLogFile, closeLogFile),
                               std::move(params),
                               *localBuildCap.externalBuilder)
 #endif
                           : makeDerivationBuilder(
-                                localBuildCap.localStore,
+                                makeBuildingStoreFromLocalStore(localBuildCap.localStore),
                                 std::make_shared<DerivationBuildingGoalCallbacks>(*this, openLogFile, closeLogFile),
                                 std::move(params)
 #ifdef _WIN32
@@ -1051,7 +1051,9 @@ Goal::Co DerivationBuildingGoal::buildLocally(
     try {
         /* Compute the FS closure of the outputs and register them as
            being valid. */
-        builtOutputs = builder->registerOutputs();
+        auto * localStoreP = dynamic_cast<LocalStore *>(&worker.store);
+        assert(localStoreP);
+        builtOutputs = builder->registerOutputs(*localStoreP);
         builder->cleanupBuild(true);
     } catch (BuilderFailureError & e) {
         builder.reset();

src/libstore/build/derivation-check.cc

@@ -10,7 +10,7 @@
 namespace nix {
 
 void checkCAOutput(
-    StoreDirConfig & store,
+    const StoreDirConfig & store,
     const StorePath & drvPath,
     const DerivationOutput & outputSpec,
     const ValidPathInfo & info,

src/libstore/build/derivation-check.hh

@@ -13,7 +13,7 @@ namespace nix {
  * Do nothing if outputSpec is not a CAFixed or CAFloating output.
  */
 void checkCAOutput(
-    StoreDirConfig & store,
+    const StoreDirConfig & store,
     const StorePath & drvPath,
     const DerivationOutput & outputSpec,
     const ValidPathInfo & info,

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

@@ -77,7 +77,7 @@ void DarwinDerivationBuilder::setUser()
 
         /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be
          * configurable */
-        if (store.config->getLocalSettings().darwinLogSandboxViolations) {
+        if (store->getLocalSettings().darwinLogSandboxViolations) {
             sandboxProfile += "(deny default)\n";
         } else {
             sandboxProfile += "(deny default (with no-log))\n";

src/libstore/darwin/build/darwin-derivation-builder.hh

@@ -15,11 +15,11 @@ struct DarwinDerivationBuilder : UnixDerivationBuilderImpl
     bool useSandbox;
 
     DarwinDerivationBuilder(
-        LocalStore & store,
+        std::unique_ptr<BuildingStore> store,
         std::shared_ptr<DerivationBuilderCallbacks> miscMethods,
         DerivationBuilderParams params,
         bool useSandbox)
-        : UnixDerivationBuilderImpl(store, miscMethods, std::move(params))
+        : UnixDerivationBuilderImpl(std::move(store), std::move(miscMethods), std::move(params))
         , useSandbox(useSandbox)
     {
     }