Support --eval-store in nix-instantiate and nix-build

src/libcmd/command.cc

@@ -56,14 +56,6 @@ void StoreCommand::run()
 
 EvalCommand::EvalCommand()
 {
-    // FIXME: move to MixEvalArgs?
-    addFlag({
-        .longName = "eval-store",
-        .description = "The Nix store to use for evaluations.",
-        .labels = {"store-url"},
-        //.category = ...,
-        .handler = {&evalStoreUrl},
-    });
 }
 
 EvalCommand::~EvalCommand()

src/libcmd/command.hh

@@ -54,8 +54,6 @@ struct EvalCommand : virtual StoreCommand, MixEvalArgs
     ref<EvalState> getEvalState();
 
 private:
-    std::optional<std::string> evalStoreUrl;
-
     std::shared_ptr<Store> evalStore;
 
     std::shared_ptr<EvalState> evalState;

src/libexpr/common-eval-args.cc

@@ -61,6 +61,14 @@ MixEvalArgs::MixEvalArgs()
             fetchers::overrideRegistry(from.input, to.input, extraAttrs);
         }}
     });
+
+    addFlag({
+        .longName = "eval-store",
+        .description = "The Nix store to use for evaluations.",
+        .category = category,
+        .labels = {"store-url"},
+        .handler = {&evalStoreUrl},
+    });
 }
 
 Bindings * MixEvalArgs::getAutoArgs(EvalState & state)

src/libexpr/common-eval-args.hh

@@ -16,8 +16,9 @@ struct MixEvalArgs : virtual Args
 
     Strings searchPath;
 
-private:
+    std::optional<std::string> evalStoreUrl;
 
+private:
     std::map<std::string, std::string> autoArgs;
 };
 

src/nix-build/nix-build.cc

@@ -250,8 +250,9 @@ static void main_nix_build(int argc, char * * argv)
         throw UsageError("'-p' and '-E' are mutually exclusive");
 
     auto store = openStore();
+    auto evalStore = myArgs.evalStoreUrl ? openStore(*myArgs.evalStoreUrl) : store;
 
-    auto state = std::make_unique<EvalState>(myArgs.searchPath, store);
+    auto state = std::make_unique<EvalState>(myArgs.searchPath, evalStore, store);
     state->repair = repair;
 
     auto autoArgs = myArgs.getAutoArgs(*state);

src/nix-instantiate/nix-instantiate.cc

@@ -153,6 +153,7 @@ static int main_nix_instantiate(int argc, char * * argv)
             settings.readOnlyMode = true;
 
         auto store = openStore();
+        auto evalStore = myArgs.evalStoreUrl ? openStore(*myArgs.evalStoreUrl) : store;
 
         auto state = std::make_unique<EvalState>(myArgs.searchPath, store);
         state->repair = repair;