diff options
| author | Shea Levy <shea@shealevy.com> | 2018-04-23T12·48-0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-04-23T12·48-0400 |
| commit | 8e6108ff71caae180d764ab9e9bff5593724655c (patch) | |
| tree | 22506136f8e27474705bb96e1ac13cec5cef5971 /src/libstore/derivations.cc | |
| 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/derivations.cc')
| -rw-r--r-- | src/libstore/derivations.cc | 12 |
1 files changed, 2 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(); } |