From 80f0b8d3070f346bb89bd0ab1a541940a7ceeec1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 23 Mar 2023 09:35:35 +0100
Subject: [PATCH] Fix SSHStore

---
 src/libstore/legacy-ssh-store.cc | 3 +++
 src/libstore/ssh-store-config.hh | 3 ---
 src/libstore/ssh-store.cc        | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/libstore/legacy-ssh-store.cc b/src/libstore/legacy-ssh-store.cc
index 72b8e89fc..98322b045 100644
--- a/src/libstore/legacy-ssh-store.cc
+++ b/src/libstore/legacy-ssh-store.cc
@@ -17,6 +17,9 @@ struct LegacySSHStoreConfig : virtual CommonSSHStoreConfig
 {
     using CommonSSHStoreConfig::CommonSSHStoreConfig;
 
+    const Setting<Path> remoteProgram{(StoreConfig*) this, "nix-store", "remote-program",
+        "Path to the `nix-store` executable on the remote machine."};
+
     const Setting<int> maxConnections{(StoreConfig*) this, 1, "max-connections",
         "Maximum number of concurrent SSH connections."};
 
diff --git a/src/libstore/ssh-store-config.hh b/src/libstore/ssh-store-config.hh
index 767fc5e05..c4232df34 100644
--- a/src/libstore/ssh-store-config.hh
+++ b/src/libstore/ssh-store-config.hh
@@ -15,9 +15,6 @@ struct CommonSSHStoreConfig : virtual StoreConfig
     const Setting<bool> compress{(StoreConfig*) this, false, "compress",
         "Whether to enable SSH compression."};
 
-    const Setting<Path> remoteProgram{(StoreConfig*) this, "nix-store", "remote-program",
-        "Path to the `nix-store` executable on the remote machine."};
-
     const Setting<std::string> remoteStore{(StoreConfig*) this, "", "remote-store",
         R"(
           [Store URL](@docroot@/command-ref/new-cli/nix3-help-stores.md#store-url-format)
diff --git a/src/libstore/ssh-store.cc b/src/libstore/ssh-store.cc
index be8a67c13..962221ad2 100644
--- a/src/libstore/ssh-store.cc
+++ b/src/libstore/ssh-store.cc
@@ -14,6 +14,9 @@ struct SSHStoreConfig : virtual RemoteStoreConfig, virtual CommonSSHStoreConfig
     using RemoteStoreConfig::RemoteStoreConfig;
     using CommonSSHStoreConfig::CommonSSHStoreConfig;
 
+    const Setting<Path> remoteProgram{(StoreConfig*) this, "nix-daemon", "remote-program",
+        "Path to the `nix-daemon` executable on the remote machine."};
+
     const std::string name() override { return "Experimental SSH Store"; }
 
     std::string doc() override