diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-12-28 13:55:55 -0600 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-01-02 23:02:50 -0600 |
| commit | 921a47bc922e4fdaf9e412d07adcd0ab3f311096 (patch) | |
| tree | 832f6892f731bd378cf453745c323f79a62f41d3 /nixos/modules/system/boot/loader/raspberrypi | |
| parent | 35af6e36057cafbb30df684326803e9e54bb377e (diff) | |
treewide: remove cross assertions
sd-image-raspberrypi, sd-image-aarch64, and sd-image-armv7l-multiplatform can all be cross compiled now.
Diffstat (limited to 'nixos/modules/system/boot/loader/raspberrypi')
| -rw-r--r-- | nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index 7e089507ff205..047651dc6426c 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -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."; }; diff --git a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix b/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix index b8c5a9f1d784f..94599a0081c62 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix @@ -1,7 +1,7 @@ { pkgs, version, configTxt }: let - isAarch64 = pkgs.stdenv.isAarch64; + isAarch64 = pkgs.stdenv.hostPlatform.isAarch64; uboot = if version == 0 then |