From 523ec0b6181bc0a1cd862c859cc693c721ec77cd Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Tue, 20 Sep 2022 21:38:31 -0500 Subject: [PATCH] fix cross logic when building u-boot (#16) --- nix/m1-support/u-boot/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nix/m1-support/u-boot/default.nix b/nix/m1-support/u-boot/default.nix index 8e428b2f..16264559 100644 --- a/nix/m1-support/u-boot/default.nix +++ b/nix/m1-support/u-boot/default.nix @@ -1,8 +1,13 @@ { lib , fetchFromGitHub +, pkgs , pkgsCross , m1n1 -}: (pkgsCross.aarch64-multiplatform.buildUBoot rec { +}: let + # u-boot's buildInputs get a different hash and don't build right if we try to + # cross-build for aarch64 on itself for whatever reason + buildPkgs = if pkgs.system == "aarch64-linux" then pkgs else pkgsCross.aarch64-multiplatform; +in (buildPkgs.buildUBoot rec { src = fetchFromGitHub { # tracking: https://github.com/AsahiLinux/PKGBUILDs/blob/main/uboot-asahi/PKGBUILD owner = "AsahiLinux";