aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2020-11-02 13:57:58 +0100
committerEelco Dolstra <edolstra@gmail.com>2020-11-02 13:57:58 +0100
commitdb5424bf09886afc1c81db36766522f68fc66ba8 (patch)
tree168b54ebbba2bea3b7df32d887896576fd362a28
parent035d0adfd8a4a20dd404cb5586cfd5414ac28b77 (diff)
Don't send eval-related settings to the daemon
-rw-r--r--src/libstore/remote-store.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 488270f48..fb52ca6d0 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -11,6 +11,7 @@
#include "finally.hh"
#include "logging.hh"
#include "callback.hh"
+#include "filetransfer.hh"
namespace nix {
@@ -171,7 +172,8 @@ void RemoteStore::setOptions(Connection & conn)
if (GET_PROTOCOL_MINOR(conn.daemonVersion) >= 12) {
std::map<std::string, Config::SettingInfo> overrides;
- globalConfig.getSettings(overrides, true);
+ settings.getSettings(overrides, true); // libstore settings
+ fileTransferSettings.getSettings(overrides, true);
overrides.erase(settings.keepFailed.name);
overrides.erase(settings.keepGoing.name);
overrides.erase(settings.tryFallback.name);