mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-26 15:56:18 +02:00
Don't let 'preferLocalBuild' override 'max-jobs=0'
This resolves #3810 by changing the behavior of `max-jobs = 0`, so that specifying the option also avoids local building of derivations with the attribute `preferLocalBuild = true`.
This commit is contained in:
parent
6254b1f5d2
commit
44fd7a05b6
1 changed files with 4 additions and 0 deletions
|
@ -101,6 +101,10 @@ bool ParsedDerivation::canBuildLocally(Store & localStore) const
|
||||||
&& !drv.isBuiltin())
|
&& !drv.isBuiltin())
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
if (settings.maxBuildJobs.get() == 0
|
||||||
|
&& !drv.isBuiltin())
|
||||||
|
return false;
|
||||||
|
|
||||||
for (auto & feature : getRequiredSystemFeatures())
|
for (auto & feature : getRequiredSystemFeatures())
|
||||||
if (!localStore.systemFeatures.get().count(feature)) return false;
|
if (!localStore.systemFeatures.get().count(feature)) return false;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue