diff options
| author | John Ericson <git@JohnEricson.me> | 2020-12-31 13:52:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-31 13:52:09 -0500 |
| commit | 15cb12178a451a5d5c273f40dec356a2e89dfc14 (patch) | |
| tree | 2c150940b9b7849126188039bfdb8e21823025b4 /lib/systems | |
| parent | 35ac9499149e286c9c7a831d72fbe120b5992244 (diff) | |
| parent | a44aec2b1b02df43f9e90f39a92a30b30de97e84 (diff) | |
| download | nixlib-15cb12178a451a5d5c273f40dec356a2e89dfc14.tar nixlib-15cb12178a451a5d5c273f40dec356a2e89dfc14.tar.gz nixlib-15cb12178a451a5d5c273f40dec356a2e89dfc14.tar.bz2 nixlib-15cb12178a451a5d5c273f40dec356a2e89dfc14.tar.lz nixlib-15cb12178a451a5d5c273f40dec356a2e89dfc14.tar.xz nixlib-15cb12178a451a5d5c273f40dec356a2e89dfc14.tar.zst nixlib-15cb12178a451a5d5c273f40dec356a2e89dfc14.zip | |
Merge pull request #107999 from andir/platforms-arm-trusted-platform
lib/systems/platforms: treat missing cpu version as generic pcBase
Diffstat (limited to 'lib/systems')
| -rw-r--r-- | lib/systems/platforms.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index a0dccc859883..fdd127e5541f 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -490,8 +490,9 @@ rec { # ARM else if platform.isAarch32 then let - version = platform.parsed.cpu.version or ""; - in if lib.versionOlder version "6" then sheevaplug + version = platform.parsed.cpu.version or null; + in if version == null then pcBase + else if lib.versionOlder version "6" then sheevaplug else if lib.versionOlder version "7" then raspberrypi else armv7l-hf-multiplatform else if platform.isAarch64 then aarch64-multiplatform |