Merge pull request #12495 from nix-windows/windows-fixes

windows: fix compilation after recent changes

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"

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

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
 }