lix-project/lix
20
58
Fork 31
Code Issues 361 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Add build-extra-platforms setting

Browse source 
This allows specifying additional systems that a machine is able to
build for. This may apply on some armv7-capable aarch64 processors, or
on systems using qemu-user with binfmt-misc to support transparent
execution of foreign-arch programs.

This removes the previous hard-coded assumptions about which systems are
ABI-compatible with which other systems, and instead relies on the user
to specify any additional platforms that they have ensured compatibility
for and wish to build for locally.

NixOS should probably add i686-linux on x86_64-linux systems for this
setting by default.
This commit is contained in:
Linus Heckemann 2018-02-20 12:34:50 +00:00
parent 24ec750003
commit eb03a296c1
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/libstore/derivations.cc
View file

@ -57,16 +57,8 @@ bool BasicDerivation::isBuiltin() const
bool BasicDerivation::canBuildLocally() const bool BasicDerivation::canBuildLocally() const
{ {
return platform == settings.thisSystem return platform == settings.thisSystem
|| isBuiltin() || settings.extraPlatforms.get().count(platform) > 0
#if __linux__ || isBuiltin();
|| (platform == "i686-linux" && settings.thisSystem == "x86_64-linux")
|| (platform == "armv6l-linux" && settings.thisSystem == "armv7l-linux")
|| (platform == "armv5tel-linux" && (settings.thisSystem == "armv7l-linux" || settings.thisSystem == "armv6l-linux"))
#elif __FreeBSD__
|| (platform == "i686-linux" && settings.thisSystem == "x86_64-freebsd")
|| (platform == "i686-linux" && settings.thisSystem == "i686-freebsd")
#endif
;
} }

3
src/libstore/globals.hh
View file

@ -295,6 +295,9 @@ public:
"Nix store has a valid signature (that is, one signed using a key " "Nix store has a valid signature (that is, one signed using a key "
"listed in 'trusted-public-keys'."}; "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<Strings> substituters{this, Setting<Strings> substituters{this,
nixStore == "/nix/store" ? Strings{"https://cache.nixos.org/"} : Strings(), nixStore == "/nix/store" ? Strings{"https://cache.nixos.org/"} : Strings(),
"substituters", "substituters",