From 73dfef364bb7b8eff43e435a30fd2fe1cc3350db Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 2 Nov 2020 17:08:02 +0100
Subject: [PATCH] Copy deriver field to the binary cache

Fixes https://github.com/NixOS/nixos-org-configurations/issues/129.
---
 src/hydra-queue-runner/build-remote.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/hydra-queue-runner/build-remote.cc b/src/hydra-queue-runner/build-remote.cc
index c602b883..2f9df16f 100644
--- a/src/hydra-queue-runner/build-remote.cc
+++ b/src/hydra-queue-runner/build-remote.cc
@@ -449,7 +449,7 @@ void State::buildRemote(ref<Store> destStore,
             while (true) {
                 auto storePathS = readString(from);
                 if (storePathS == "") break;
-                readString(from); // deriver
+                auto deriver = readString(from); // deriver
                 auto references = worker_proto::read(*localStore, from, Phantom<StorePathSet> {});
                 readLongLong(from); // download size
                 auto narSize = readLongLong(from);
@@ -463,6 +463,8 @@ void State::buildRemote(ref<Store> destStore,
                 totalNarSize += info.narSize;
                 info.narHash = narHash;
                 info.ca = ca;
+                if (deriver != "")
+                    info.deriver = localStore->parseStorePath(deriver);
                 infos.insert_or_assign(info.path, info);
             }