git.iko.soy/typeable/nixpkgs
on master help sign in
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.

commita44aec2b1b02df43f9e90f39a92a30b30de97e84 authorAndreas Rammhold <andreas@rammhold.de> dateThu 31 Dec 2020, 00:06 (6 years ago) parent7b968c7
1 file changed+3−2
lib/systems/platforms.nix+3−2
lib/systems/platforms.nix+3−2
@@ -490,8 +490,9 @@ rec {
490490
491491 # ARM
492492 else if platform.isAarch32 then let
493− version = platform.parsed.cpu.version or "";
494− in if lib.versionOlder version "6" then sheevaplug
493+ version = platform.parsed.cpu.version or null;
494+ in if version == null then pcBase
495+ else if lib.versionOlder version "6" then sheevaplug
495496 else if lib.versionOlder version "7" then raspberrypi
496497 else armv7l-hf-multiplatform
497498 else if platform.isAarch64 then aarch64-multiplatform