From 9f1a7f9d370b17d760b5f97ae73118cabc099590 Mon Sep 17 00:00:00 2001 From: Finn Behrens Date: Tue, 1 Jun 2021 09:48:35 +0200 Subject: [PATCH] Include aarch64-darwin in installer Co-authored-by: Matthew Bauer --- flake.nix | 2 +- scripts/install.in | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index 1bb05e6d7..6c65e3406 100644 --- a/flake.nix +++ b/flake.nix @@ -387,7 +387,7 @@ # to https://nixos.org/nix/install. It downloads the binary # tarball for the user's system and calls the second half of the # installation script. - installerScript = installScriptFor [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]; + installerScript = installScriptFor [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; installerScriptForGHA = installScriptFor [ "x86_64-linux" "x86_64-darwin" ]; # Line coverage analysis. diff --git a/scripts/install.in b/scripts/install.in index f660e3807..39016d161 100755 --- a/scripts/install.in +++ b/scripts/install.in @@ -46,15 +46,9 @@ case "$(uname -s).$(uname -m)" in system=x86_64-darwin ;; Darwin.arm64|Darwin.aarch64) - # check for Rosetta 2 support - if ! [ -f /Library/Apple/System/Library/LaunchDaemons/com.apple.oahd.plist ]; then - oops "Rosetta 2 is not installed on this ARM64 macOS machine. Run softwareupdate --install-rosetta then restart installation" - fi - - hash=@tarballHash_x86_64-darwin@ - path=@tarballPath_x86_64-darwin@ - # eventually maybe: aarch64-darwin - system=x86_64-darwin + hash=@binaryTarball_aarch64-darwin@ + path=@tarballPath_aarch64-darwin@ + system=aarch64-darwin ;; *) oops "sorry, there is no binary distribution of Nix for your platform";; esac