1 files changed, 10 insertions, 0 deletions
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index c67e53bfb87e..56396541adec 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -184,6 +184,7 @@ RemoteStore::~RemoteStore()
 void RemoteStore::setOptions()
 {
     writeInt(wopSetOptions, to);
+
     writeInt(settings.keepFailed, to);
     writeInt(settings.keepGoing, to);
     writeInt(settings.tryFallback, to);
@@ -202,6 +203,15 @@ void RemoteStore::setOptions()
     if (GET_PROTOCOL_MINOR(daemonVersion) >= 10)
         writeInt(settings.useSubstitutes, to);
 
+    if (GET_PROTOCOL_MINOR(daemonVersion) >= 12) {
+        Settings::SettingsMap overrides = settings.getOverrides();
+        writeInt(overrides.size(), to);
+        foreach (Settings::SettingsMap::iterator, i, overrides) {
+            writeString(i->first, to);
+            writeString(i->second, to);
+        }
+    }
+
     processStderr();
 }