wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

windows: fix compilation after recent changes

Browse source 
Specifically last few week's merges involving legacy SSH options and
dynamic derivations.
This commit is contained in:
Brian McKenna 2025-02-18 14:39:22 +11:00
parent 1f688d62d7
commit e0617d2545
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,6 @@
#pragma once #pragma once
#include "parsed-derivations.hh" #include "parsed-derivations.hh"
#include "user-lock.hh"
#include "store-api.hh" #include "store-api.hh"
#include "pathlocks.hh" #include "pathlocks.hh"
#include "goal.hh" #include "goal.hh"

2
src/libstore/build/worker.cc
View file

@ -4,8 +4,8 @@
#include "substitution-goal.hh" #include "substitution-goal.hh"
#include "drv-output-substitution-goal.hh" #include "drv-output-substitution-goal.hh"
#include "derivation-goal.hh" #include "derivation-goal.hh"
#include "derivation-creation-and-realisation-goal.hh"
#ifndef _WIN32 // TODO Enable building on Windows #ifndef _WIN32 // TODO Enable building on Windows
# include "derivation-creation-and-realisation-goal.hh"
# include "local-derivation-goal.hh" # include "local-derivation-goal.hh"
# include "hook-instance.hh" # include "hook-instance.hh"
#endif #endif

5
src/libstore/legacy-ssh-store.cc
View file

@ -367,7 +367,12 @@ unsigned int LegacySSHStore::getProtocol()
pid_t LegacySSHStore::getConnectionPid() pid_t LegacySSHStore::getConnectionPid()
{ {
auto conn(connections->get()); auto conn(connections->get());
#ifndef _WIN32
return conn->sshConn->sshPid; return conn->sshConn->sshPid;
#else
// TODO: Implement
return 0;
#endif
} }