diff options
| author | Linus Heckemann <git@sphalerite.org> | 2018-02-20T12·34+0000 |
|---|---|---|
| committer | Linus Heckemann <git@sphalerite.org> | 2018-02-27T00·27+0000 |
| commit | eb03a296c1a538111056ce0d554911410c4ccb48 (patch) | |
| tree | 40a6e8e15117c2c470c6a20fec3a8e518ac93879 | |
| parent | 24ec7500032c2434e450b7bc3f77ff4c1f12c41c (diff) | |
Add build-extra-platforms setting
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.
| -rw-r--r-- | src/libstore/derivations.cc | 12 | ||||
| -rw-r--r-- | src/libstore/globals.hh | 3 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc index a0a0d78b7d30..74b861281ee0 100644 --- a/src/libstore/derivations.cc +++ b/src/libstore/derivations.cc @@ -57,16 +57,8 @@ bool BasicDerivation::isBuiltin() const bool BasicDerivation::canBuildLocally() const { return platform == settings.thisSystem - || isBuiltin() -#if __linux__ - || (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 - ; + || settings.extraPlatforms.get().count(platform) > 0 + || isBuiltin(); } diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index dd01f832df0c..b382da01e97e 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -295,6 +295,9 @@ 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<Strings> substituters{this, nixStore == "/nix/store" ? Strings{"https://cache.nixos.org/"} : Strings(), "substituters", |