From f7647fb52f8f3cc23606544dc186739d04e14a58 Mon Sep 17 00:00:00 2001 From: Ivan-Velickovic Date: Mon, 28 Oct 2024 15:59:11 +1100 Subject: [PATCH] flake.nix: use correct bintools for ARM We need the unwrapped bintools (in particular LD) since Nix seems to be putting all sorts of nonsense in the command line parameters that doesn't make sense on non-Linux systems. After all, we aren't target Linux, we're targeting aarch64-none-elf. This patch is exactly the same as a previous one I made but for RISC-V, I forgot to apply the same thing to AArch64. Signed-off-by: Ivan-Velickovic --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index d0466cdd..8f238c04 100644 --- a/flake.nix +++ b/flake.nix @@ -94,7 +94,7 @@ name = "microkit-shell"; nativeBuildInputs = with pkgs; [ - pkgsCross.aarch64-embedded.stdenv.cc.bintools + pkgsCross.aarch64-embedded.stdenv.cc.bintools.bintools pkgsCross.aarch64-embedded.stdenv.cc.cc pkgsCross.riscv64-embedded.stdenv.cc.bintools.bintools pkgsCross.riscv64-embedded.stdenv.cc.cc