From 637701b6047bff23a7dea4e02bebf94660b8cb4c Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 16 Mar 2018 22:50:27 +0000 Subject: rename build-extra-platforms -> extra-platforms also document it --- src/libstore/globals.hh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/libstore/globals.hh') diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index b382da01e97e..897d53b7b94c 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 extraPlatforms{this, StringSet{}, "build-extra-platforms", - "Additional platforms that can be built on the local system, e.g. using qemu-user."}; + Setting 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 substituters{this, nixStore == "/nix/store" ? Strings{"https://cache.nixos.org/"} : Strings(), -- cgit 1.4.1