diff options
| author | Shea Levy <shea@shealevy.com> | 2018-04-23 08:48:22 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-04-23 08:48:22 -0400 |
| commit | 8e6108ff71caae180d764ab9e9bff5593724655c (patch) | |
| tree | 22506136f8e27474705bb96e1ac13cec5cef5971 /src/libstore/globals.hh | |
| parent | e2b028353b198d1590ee14101dbb74cd2a4c5730 (diff) | |
| parent | 639c166647ae733e927ae589864d996bb2d95b88 (diff) | |
Merge branch 'aarch64-armv7' of git://github.com/lheckemann/nix
Support extra compatible architectures (#1916)
Diffstat (limited to 'src/libstore/globals.hh')
| -rw-r--r-- | src/libstore/globals.hh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index 7430bbedb..0ae69242a 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -295,6 +295,13 @@ public: "Nix store has a valid signature (that is, one signed using a key " "listed in 'trusted-public-keys'."}; + 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(), "substituters", |