nrabulinski/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

build-remote: Implicitly add the 'builtin' system type to all machines

Browse source 
This makes 'nix-env -i --max-jobs 0' work with remote builders.
This commit is contained in:
Eelco Dolstra 2021-10-27 14:25:13 +02:00
parent f2280749b1
commit 1254e8753c
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/build-remote/build-remote.cc
View file

@ -131,11 +131,14 @@ static int main_build_remote(int argc, char * * argv)
for (auto & m : machines) {
debug("considering building on remote machine '%s'", m.storeUri);
if (m.enabled && std::find(m.systemTypes.begin(),
m.systemTypes.end(),
neededSystem) != m.systemTypes.end() &&
if (m.enabled
&& (neededSystem == "builtin"
|| std::find(m.systemTypes.begin(),
m.systemTypes.end(),
neededSystem) != m.systemTypes.end()) &&
m.allSupported(requiredFeatures) &&
m.mandatoryMet(requiredFeatures)) {
m.mandatoryMet(requiredFeatures))
{
rightType = true;
AutoCloseFD free;
uint64_t load = 0;