From 341836ced2a4556abcf68eec0164ced9fd79ff8a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 14 May 2021 12:53:57 +0000 Subject: [PATCH] nixos-rebuild: support prebuilt Nix on aarch64 We have a fallback hashes entry for aarch64-linux, but it was unused by nixos-rebuild. --- pkgs/os-specific/linux/nixos-rebuild/default.nix | 1 + pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/nixos-rebuild/default.nix b/pkgs/os-specific/linux/nixos-rebuild/default.nix index 9fb7e3664658..b317c5a1fbfd 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/default.nix +++ b/pkgs/os-specific/linux/nixos-rebuild/default.nix @@ -18,5 +18,6 @@ substituteAll { inherit runtimeShell nix; nix_x86_64_linux = fallback.x86_64-linux; nix_i686_linux = fallback.i686-linux; + nix_aarch64_linux = fallback.aarch64-linux; path = lib.makeBinPath [ coreutils jq gnused gnugrep ]; } diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 01d0fa823b9b..03b1dd347b7e 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -386,6 +386,8 @@ prebuiltNix() { echo @nix_x86_64_linux@ elif [[ "$machine" =~ i.86 ]]; then echo @nix_i686_linux@ + elif [[ "$machine" = aarch64 ]]; then + echo @nix_aarch64_linux@ else echo "$0: unsupported platform" exit 1