NixOS
diff --git a/‎flake.lock
+3-3 b/‎flake.lock
+3-3
diff --git a/‎src/hydra-queue-runner/build-remote.cc
+1-2 b/‎src/hydra-queue-runner/build-remote.cc
+1-2
@@ -2,7 +2,6 @@
 
 #include "build-result.hh"
 #include "serve-protocol.hh"
-#include "serve-protocol-impl.hh"
 #include "state.hh"
 #include "current-process.hh"
 #include "processes.hh"
@@ -134,7 +133,7 @@ void State::buildRemote(ref<Store> destStore,
         {
             auto activeStepState(activeStep->state_.lock());
             if (activeStepState->cancelled) throw Error("step cancelled");
-            activeStepState->pid = child->sshPid;
+            activeStepState->pid = conn.store->getConnectionPid();
         }
 
         Finally clearPid([&]() {
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`#include "build-result.hh"`
`4`	`4`	`#include "serve-protocol.hh"`
`5`		`-#include "serve-protocol-impl.hh"`
`6`	`5`	`#include "state.hh"`
`7`	`6`	`#include "current-process.hh"`
`8`	`7`	`#include "processes.hh"`
`@@ -134,7 +133,7 @@ void State::buildRemote(ref<Store> destStore,`
`134`	`133`	`{`
`135`	`134`	`auto activeStepState(activeStep->state_.lock());`
`136`	`135`	`if (activeStepState->cancelled) throw Error("step cancelled");`
`137`		`- activeStepState->pid = child->sshPid;`
	`136`	`+ activeStepState->pid = conn.store->getConnectionPid();`
`138`	`137`	`}`
`139`	`138`
`140`	`139`	`Finally clearPid([&]() {`