From 26a2997fd4ac7dde5706471916c95a914e37ae72 Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Tue, 30 Jan 2024 09:10:10 +1100
Subject: [PATCH] use arm64 instead of aarch64 to match `uname`, fixes #6

---
 builder/src/main.rs          | 2 +-
 builder/tests/integration.rs | 2 +-
 cli/src/platform.rs          | 8 ++++----
 nix/all-platforms.nix        | 2 +-
 nix/lock.gup                 | 4 ++--
 nix/runix.nix                | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/builder/src/main.rs b/builder/src/main.rs
index 85a6da1..4f00f61 100644
--- a/builder/src/main.rs
+++ b/builder/src/main.rs
@@ -52,7 +52,7 @@ pub fn all_platforms() -> Vec<&'static str> {
 	vec!(
 		"x86_64-Linux",
 		"x86_64-Darwin",
-		"aarch64-Darwin",
+		"arm64-Darwin",
 	)
 }
 
diff --git a/builder/tests/integration.rs b/builder/tests/integration.rs
index 2cca66e..cf5fbdd 100644
--- a/builder/tests/integration.rs
+++ b/builder/tests/integration.rs
@@ -219,7 +219,7 @@ fn crossplatform_file_types() -> Result<()> {
 					(arch, os) => {
 						let arch_name = match arch {
 							"x86_64" => "x86-64",
-							"aarch64" => "arm64",
+							"arm64" => "arm64",
 							_ => todo!(),
 						};
 						let exe_type = match os {
diff --git a/cli/src/platform.rs b/cli/src/platform.rs
index a71b28e..f38bb42 100644
--- a/cli/src/platform.rs
+++ b/cli/src/platform.rs
@@ -42,7 +42,7 @@ impl Display for OS {
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum Arch {
 	x86_64,
-	aarch64,
+	arm64,
 }
 
 impl FromStr for Arch {
@@ -51,7 +51,7 @@ impl FromStr for Arch {
 	fn from_str(s: &str) -> Result<Self, Self::Err> {
 		match s {
 			"x86_64" => Ok(Self::x86_64),
-			"aarch64" => Ok(Self::aarch64),
+			"arm64" => Ok(Self::arm64),
 			other => Err(anyhow!("Unknown arch: {}", other))
 		}
 	}
@@ -62,7 +62,7 @@ impl Arch {
 		if cfg!(target_arch = "x86_64") {
 			Ok(Self::x86_64)
 		} else if cfg!(target_arch = "aarch64") {
-			Ok(Self::aarch64)
+			Ok(Self::arm64)
 		} else {
 			Err(anyhow!("Unknown architecture: {}", std::env::consts::ARCH))
 		}
@@ -73,7 +73,7 @@ impl Display for Arch {
 	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 		f.write_str(match self {
 			Self::x86_64 => "x86_64",
-			Self::aarch64 => "aarch64",
+			Self::arm64 => "arm64",
 		})
 	}
 }
diff --git a/nix/all-platforms.nix b/nix/all-platforms.nix
index 6738055..b71a331 100644
--- a/nix/all-platforms.nix
+++ b/nix/all-platforms.nix
@@ -5,5 +5,5 @@ listToAttrs (map (platform: {
 }) [
 	"x86_64-Darwin"
 	"x86_64-Linux"
-	"aarch64-Darwin"
+	"arm64-Darwin"
 ])
diff --git a/nix/lock.gup b/nix/lock.gup
index 7063cb0..e586dbc 100644
--- a/nix/lock.gup
+++ b/nix/lock.gup
@@ -5,8 +5,8 @@ mkdir "$1"
 fetlock -o "$1/x86_64-Linux.nix" -p .. --cargo-platform x86_64-unknown-linux-gnu
 fetlock -o "$1/x86_64-Darwin.nix" -p .. --cargo-platform x86_64-apple-darwin
 
-# assume aarch64 has the same deps :shrug:
-ln -sfn "./x86_64-Darwin.nix" "$1/aarch64-Darwin.nix"
+# assume arm64 has the same deps :shrug:
+ln -sfn "./x86_64-Darwin.nix" "$1/arm64-Darwin.nix"
 
 platform="$(echo "$(uname -m)-$(uname -s)")"
 ln -sfn "./$platform.nix" "$1/current.nix"
diff --git a/nix/runix.nix b/nix/runix.nix
index 7ff4155..d394c64 100644
--- a/nix/runix.nix
+++ b/nix/runix.nix
@@ -4,7 +4,7 @@ let
 	_platformArg = platform;
 	sources = import ./sources.nix {};
 	getNixPlatform = p: builtins.getAttr p {
-		"aarch64-Darwin" = "aarch64-apple-darwin";
+		"arm64-Darwin" = "aarch64-apple-darwin";
 		"x86_64-Darwin" = "x86_64-apple-darwin";
 		"x86_64-Linux" = "x86_64-unknown-linux-musl";
 	};