diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2018-03-21T14·10+0100 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2018-03-21T14·10+0100 |
commit | 8615cfb1301d9402495a7558f8c66f63978f1c6d (patch) | |
tree | a82b092518bbe7c7631871c2e283809d1a5f935d /src/libstore | |
parent | bed22114bf9c91077ac4d4ff7bb7084d94567383 (diff) |
LegacySSHStore: Allow overriding the path to nix-store
Diffstat (limited to 'src/libstore')
-rw-r--r-- | src/libstore/legacy-ssh-store.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstore/legacy-ssh-store.cc b/src/libstore/legacy-ssh-store.cc index dfefdb9bc874..2a2e3d914815 100644 --- a/src/libstore/legacy-ssh-store.cc +++ b/src/libstore/legacy-ssh-store.cc @@ -16,6 +16,7 @@ struct LegacySSHStore : public Store const Setting<int> maxConnections{this, 1, "max-connections", "maximum number of concurrent SSH connections"}; const Setting<Path> sshKey{this, "", "ssh-key", "path to an SSH private key"}; const Setting<bool> compress{this, false, "compress", "whether to compress the connection"}; + const Setting<Path> remoteProgram{this, "nix-store", "remote-program", "path to the nix-store executable on the remote system"}; // Hack for getting remote build log output. const Setting<int> logFD{this, -1, "log-fd", "file descriptor to which SSH's stderr is connected"}; @@ -55,7 +56,7 @@ struct LegacySSHStore : public Store ref<Connection> openConnection() { auto conn = make_ref<Connection>(); - conn->sshConn = master.startCommand("nix-store --serve --write"); + conn->sshConn = master.startCommand(fmt("%s --serve --write", remoteProgram)); conn->to = FdSink(conn->sshConn->in.get()); conn->from = FdSource(conn->sshConn->out.get()); |