From 605b2371f96c020516ee3e9596ff6df3db0f0be5 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 21:30:35 +0000 Subject: [PATCH] windows: fix compilation after recent changes (backport #12495) (#12561) * windows: fix compilation after recent changes Specifically last few week's merges involving legacy SSH options and dynamic derivations. (cherry picked from commit e0617d25453760e2f5817ece317914eee9330768) # Conflicts: # src/libstore/build/derivation-creation-and-realisation-goal.hh * Remove unneeded * Remove unneeded --------- Co-authored-by: Brian McKenna Co-authored-by: Eelco Dolstra --- src/libstore/legacy-ssh-store.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libstore/legacy-ssh-store.cc b/src/libstore/legacy-ssh-store.cc index 3849f088d..480f41059 100644 --- a/src/libstore/legacy-ssh-store.cc +++ b/src/libstore/legacy-ssh-store.cc @@ -367,7 +367,12 @@ unsigned int LegacySSHStore::getProtocol() pid_t LegacySSHStore::getConnectionPid() { auto conn(connections->get()); +#ifndef _WIN32 return conn->sshConn->sshPid; +#else + // TODO: Implement + return 0; +#endif }