scriptis/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Call it aarch64-darwin instead of arm64-darwin

Browse source 
gnu-config standardized on aarch64 for machine name so host_cpu part
of $system will always be aarch64. That means system will be
aarch64-darwin too.

uname however could report either “aarch64” (if gnu coreutils) or
“arm64” (if apple’s uname). We should support both for compatiblity
here.
This commit is contained in:
Matthew Bauer 2020-12-02 19:05:02 -06:00
parent b0de7b2016
commit addf9f4ede
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/install.in
View file

@ -45,7 +45,7 @@ case "$(uname -s).$(uname -m)" in
path=@tarballPath_x86_64-darwin@ path=@tarballPath_x86_64-darwin@
system=x86_64-darwin system=x86_64-darwin
;; ;;
Darwin.arm64) Darwin.arm64|Darwin.aarch64)
# check for Rosetta 2 support # check for Rosetta 2 support
if ! [ -d /Library/Apple/usr/libexec/oah ]; then if ! [ -d /Library/Apple/usr/libexec/oah ]; then
oops "Rosetta 2 is not installed on this ARM64 macOS machine. Run softwareupdate --install-rosetta then restart installation" oops "Rosetta 2 is not installed on this ARM64 macOS machine. Run softwareupdate --install-rosetta then restart installation"
@ -53,7 +53,7 @@ case "$(uname -s).$(uname -m)" in
hash=@binaryTarball_x86_64-darwin@ hash=@binaryTarball_x86_64-darwin@
path=@tarballPath_x86_64-darwin@ path=@tarballPath_x86_64-darwin@
# eventually maybe: arm64-darwin # eventually maybe: aarch64-darwin
system=x86_64-darwin system=x86_64-darwin
;; ;;
*) oops "sorry, there is no binary distribution of Nix for your platform";; *) oops "sorry, there is no binary distribution of Nix for your platform";;