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 (backport #12495) (#12561)

Browse source 
* windows: fix compilation after recent changes

Specifically last few week's merges involving legacy SSH options and
dynamic derivations.

(cherry picked from commit e0617d2545)

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

* Remove unneeded

* Remove unneeded

---------

Co-authored-by: Brian McKenna <brian@brianmckenna.org>
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
This commit is contained in:
mergify[bot] 2025-02-24 21:30:35 +00:00 • committed by GitHub
parent 6d9724a2b3
commit 605b2371f9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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
} }