From ff3f5eb4d8751243a1f7e738a5124c650e541aca Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 31 Jul 2015 03:41:55 +0200
Subject: [PATCH] Fix remote building on Nix 1.10

---
 src/hydra-queue-runner/build-remote.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/hydra-queue-runner/build-remote.cc b/src/hydra-queue-runner/build-remote.cc
index 55efcf15..92a6fb28 100644
--- a/src/hydra-queue-runner/build-remote.cc
+++ b/src/hydra-queue-runner/build-remote.cc
@@ -189,11 +189,12 @@ void State::buildRemote(std::shared_ptr<StoreAPI> store,
     }
 
     /* Gather the inputs. If the remote side is Nix <= 1.9, we have to
-       copy the entire closure of ‘drvPath’, as well the required
+       copy the entire closure of ‘drvPath’, as well as the required
        outputs of the input derivations. On Nix > 1.9, we only need to
        copy the immediate sources of the derivation and the required
        outputs of the input derivations. */
     PathSet inputs;
+    BasicDerivation basicDrv(step->drv);
 
     if (sendDerivation)
         inputs.insert(step->drvPath);
@@ -207,6 +208,7 @@ void State::buildRemote(std::shared_ptr<StoreAPI> store,
             auto i = drv2.outputs.find(name);
             if (i == drv2.outputs.end()) continue;
             inputs.insert(i->second.path);
+            basicDrv.inputSrcs.insert(i->second.path);
         }
     }
 
@@ -228,7 +230,7 @@ void State::buildRemote(std::shared_ptr<StoreAPI> store,
     if (sendDerivation)
         to << cmdBuildPaths << PathSet({step->drvPath}) << maxSilentTime << buildTimeout;
     else
-        to << cmdBuildDerivation << step->drvPath << step->drv << maxSilentTime << buildTimeout;
+        to << cmdBuildDerivation << step->drvPath << basicDrv << maxSilentTime << buildTimeout;
         // FIXME: send maxLogSize.
     to.flush();