kloenk/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

LegacySSHStore: Allow overriding the path to nix-store

Browse source
This commit is contained in:
Eelco Dolstra 2018-03-21 15:10:46 +01:00
parent bed22114bf
commit 8615cfb130
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libstore/legacy-ssh-store.cc
View file

@ -16,6 +16,7 @@ struct LegacySSHStore : public Store
const Setting<int> maxConnections{this, 1, "max-connections", "maximum number of concurrent SSH connections"}; 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<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<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. // Hack for getting remote build log output.
const Setting<int> logFD{this, -1, "log-fd", "file descriptor to which SSH's stderr is connected"}; 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() ref<Connection> openConnection()
{ {
auto conn = make_ref<Connection>(); 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->to = FdSink(conn->sshConn->in.get());
conn->from = FdSource(conn->sshConn->out.get()); conn->from = FdSource(conn->sshConn->out.get());