From 0739d428e07b59b7d44bdbf7354dafaae09dba7c Mon Sep 17 00:00:00 2001
From: Carlo Nucera <carlo.nucera@protonmail.com>
Date: Wed, 5 Aug 2020 17:49:45 -0400
Subject: Solve template deduction problem

We had to predeclare our template functions
---
 src/libstore/daemon.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libstore/daemon.cc')

diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc
index e18f793c8..a420dcab0 100644
--- a/src/libstore/daemon.cc
+++ b/src/libstore/daemon.cc
@@ -327,7 +327,7 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
         logger->startWork();
         auto outputs = store->queryDerivationOutputMap(path);
         logger->stopWork();
-        write(*store, to, outputs);
+        nix::worker_proto::write(*store, to, outputs);
         break;
     }
 
-- 
cgit v1.2.3


From 8b175f58d1a25dd904fb0ffdf5b2b9501983dba0 Mon Sep 17 00:00:00 2001
From: Carlo Nucera <carlo.nucera@protonmail.com>
Date: Wed, 5 Aug 2020 17:57:07 -0400
Subject: Simplify the namespace

---
 src/libstore/daemon.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libstore/daemon.cc')

diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc
index a420dcab0..9503915eb 100644
--- a/src/libstore/daemon.cc
+++ b/src/libstore/daemon.cc
@@ -327,7 +327,7 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
         logger->startWork();
         auto outputs = store->queryDerivationOutputMap(path);
         logger->stopWork();
-        nix::worker_proto::write(*store, to, outputs);
+        worker_proto::write(*store, to, outputs);
         break;
     }
 
-- 
cgit v1.2.3