From e0617d25453760e2f5817ece317914eee9330768 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Tue, 18 Feb 2025 14:39:22 +1100 Subject: [PATCH] windows: fix compilation after recent changes Specifically last few week's merges involving legacy SSH options and dynamic derivations. --- .../build/derivation-creation-and-realisation-goal.hh | 1 - src/libstore/build/worker.cc | 2 +- src/libstore/legacy-ssh-store.cc | 5 +++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libstore/build/derivation-creation-and-realisation-goal.hh b/src/libstore/build/derivation-creation-and-realisation-goal.hh index 9960484ac..40fe40053 100644 --- a/src/libstore/build/derivation-creation-and-realisation-goal.hh +++ b/src/libstore/build/derivation-creation-and-realisation-goal.hh @@ -1,7 +1,6 @@ #pragma once #include "parsed-derivations.hh" -#include "user-lock.hh" #include "store-api.hh" #include "pathlocks.hh" #include "goal.hh" diff --git a/src/libstore/build/worker.cc b/src/libstore/build/worker.cc index 6510bbe9e..b765fc2a0 100644 --- a/src/libstore/build/worker.cc +++ b/src/libstore/build/worker.cc @@ -4,8 +4,8 @@ #include "substitution-goal.hh" #include "drv-output-substitution-goal.hh" #include "derivation-goal.hh" +#include "derivation-creation-and-realisation-goal.hh" #ifndef _WIN32 // TODO Enable building on Windows -# include "derivation-creation-and-realisation-goal.hh" # include "local-derivation-goal.hh" # include "hook-instance.hh" #endif 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 }