diff options
| author | Linus Heckemann <git@sphalerite.org> | 2018-03-16 22:50:27 +0000 |
|---|---|---|
| committer | Linus Heckemann <git@sphalerite.org> | 2018-03-16 22:50:27 +0000 |
| commit | 637701b6047bff23a7dea4e02bebf94660b8cb4c (patch) | |
| tree | 3e279d52cefbb86152166a2d17d379d54e7dacc6 /src | |
| parent | 919c3c20b3ebbf8b83b8de28b612d09270e7a2a6 (diff) | |
rename build-extra-platforms -> extra-platforms
also document it
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstore/globals.hh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index b382da01e..897d53b7b 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -295,8 +295,12 @@ public: "Nix store has a valid signature (that is, one signed using a key " "listed in 'trusted-public-keys'."}; - Setting<StringSet> extraPlatforms{this, StringSet{}, "build-extra-platforms", - "Additional platforms that can be built on the local system, e.g. using qemu-user."}; + Setting<StringSet> extraPlatforms{this, + SYSTEM == "x86_64-linux" ? StringSet{"i686-linux"} : StringSet{}, + "extra-platforms", + "Additional platforms that can be built on the local system. " + "These may be supported natively (e.g. armv7 on some aarch64 CPUs " + "or using hacks like qemu-user."}; Setting<Strings> substituters{this, nixStore == "/nix/store" ? Strings{"https://cache.nixos.org/"} : Strings(), |