Handle derivations with system type 'builtin'

Fixes #540.
This commit is contained in:
Eelco Dolstra 2018-03-07 10:22:35 +01:00
parent 68afa2bf6f
commit 5a1f2a50e5
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE

View file

@ -251,7 +251,8 @@ struct Machine
{
/* Check that this machine is of the type required by the
step. */
if (!systemTypes.count(step->drv.platform)) return false;
if (!systemTypes.count(step->drv.platform == "builtin" ? nix::settings.thisSystem : step->drv.platform))
return false;
/* Check that the step requires all mandatory features of this
machine. (Thus, a machine with the mandatory "benchmark"