diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2020-12-31 00:06:31 +0100 |
|---|---|---|
| committer | Andreas Rammhold <andreas@rammhold.de> | 2020-12-31 00:12:07 +0100 |
| commit | a44aec2b1b02df43f9e90f39a92a30b30de97e84 (patch) | |
| tree | 0a89fa3e738fde65ac2396799b65b045f42c3690 /lib/systems/platforms.nix | |
| parent | 7b968c79a15796c524b75a0e43d643e36aa10e97 (diff) | |
| download | nixpkgs-a44aec2b1b02df43f9e90f39a92a30b30de97e84.tar nixpkgs-a44aec2b1b02df43f9e90f39a92a30b30de97e84.tar.gz nixpkgs-a44aec2b1b02df43f9e90f39a92a30b30de97e84.tar.bz2 nixpkgs-a44aec2b1b02df43f9e90f39a92a30b30de97e84.tar.lz nixpkgs-a44aec2b1b02df43f9e90f39a92a30b30de97e84.tar.xz nixpkgs-a44aec2b1b02df43f9e90f39a92a30b30de97e84.tar.zst nixpkgs-a44aec2b1b02df43f9e90f39a92a30b30de97e84.zip | |
lib/systems/platforms: treat missing cpu version as generic pcBase
Since 40e7be1 all ARM platforms that didn't have a parsed cpu version (e.g. arm-none-eabi) would be handled as armv7l-hf-multiplatform which did break building arm-trusted-platform packages for some targets (e.g. rk3399). Using pcBase as fallback, instead of armv7l-hf-multiplatform, corresponds with the behaviour we had before 40e7be1.
Diffstat (limited to 'lib/systems/platforms.nix')
| -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 a0dccc85988..fdd127e5541 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 |