gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: remove cross assertions

Browse Source 
sd-image-raspberrypi, sd-image-aarch64, and
sd-image-armv7l-multiplatform can all be cross compiled now.
This commit is contained in:
Matthew Bauer
2018-12-28 13:55:55 -06:00
parent 35af6e3605
commit 921a47bc92
5 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
View File

@@ -19,7 +19,7 @@ let
blCfg = config.boot.loader;
timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout;
isAarch64 = pkgs.stdenv.isAarch64;
isAarch64 = pkgs.stdenv.hostPlatform.isAarch64;
optional = pkgs.stdenv.lib.optionalString;
configTxt =
@@ -97,7 +97,7 @@ in
config = mkIf cfg.enable {
assertions = singleton {
assertion = !pkgs.stdenv.isAarch64 || cfg.version == 3;
assertion = !pkgs.stdenv.hostPlatform.isAarch64 || cfg.version == 3;
message = "Only Raspberry Pi 3 supports aarch64.";
};