Skip to content

Commit e0617d2

Browse files
committed
windows: fix compilation after recent changes
Specifically last few week's merges involving legacy SSH options and dynamic derivations.
1 parent 1f688d6 commit e0617d2

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

src/libstore/build/derivation-creation-and-realisation-goal.hh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#pragma once
22

33
#include "parsed-derivations.hh"
4-
#include "user-lock.hh"
54
#include "store-api.hh"
65
#include "pathlocks.hh"
76
#include "goal.hh"

src/libstore/build/worker.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#include "substitution-goal.hh"
55
#include "drv-output-substitution-goal.hh"
66
#include "derivation-goal.hh"
7+
#include "derivation-creation-and-realisation-goal.hh"
78
#ifndef _WIN32 // TODO Enable building on Windows
8-
# include "derivation-creation-and-realisation-goal.hh"
99
# include "local-derivation-goal.hh"
1010
# include "hook-instance.hh"
1111
#endif

src/libstore/legacy-ssh-store.cc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,12 @@ unsigned int LegacySSHStore::getProtocol()
367367
pid_t LegacySSHStore::getConnectionPid()
368368
{
369369
auto conn(connections->get());
370+
#ifndef _WIN32
370371
return conn->sshConn->sshPid;
372+
#else
373+
// TODO: Implement
374+
return 0;
375+
#endif
371376
}
372377

373378

0 commit comments

Comments
 (0)