1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-29 19:03:16 +02:00

Merge branch 'aarch64-armv7' of git://github.com/lheckemann/nix

Support extra compatible architectures (#1916)
This commit is contained in:
Shea Levy 2018-04-23 08:48:22 -04:00
commit 8e6108ff71
No known key found for this signature in database
GPG key ID: 5C0BD6957D86FE27
5 changed files with 35 additions and 11 deletions

View file

@ -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",