From 1f3c3a3785b21fe349480b562d5f97b8cc9caa6d Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Fri, 5 Nov 2021 16:17:49 +0100
Subject: Make the flake options work when using the daemon
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When setting flake-local options (with the `nixConfig` field), forward
these options to the daemon in case we’re using one.

This is necessary in particular for options like `binary-caches` or
`post-build-hook` to make sense.

Fix <https://github.com/NixOS/nix/commit/343239fc8a1993f707a990c2cd54a41f1fa3de99#r44356843>
---
 src/libstore/remote-store.hh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/libstore/remote-store.hh')

diff --git a/src/libstore/remote-store.hh b/src/libstore/remote-store.hh
index a3036e6b0..5f6da9af5 100644
--- a/src/libstore/remote-store.hh
+++ b/src/libstore/remote-store.hh
@@ -147,6 +147,8 @@ protected:
 
     virtual void setOptions(Connection & conn);
 
+    void setOptions() override;
+
     ConnectionHandle getConnection();
 
     friend struct ConnectionHandle;
-- 
cgit v1.2.3