From 360b86c7de742c5f76807bbbfe2e9c573985ca56 Mon Sep 17 00:00:00 2001
From: pgattic <pgattic@gmail.com>
Date: Tue, 7 Apr 2026 21:07:25 -0600
Subject: [PATCH] Add arm64 Support

Will need to re-generate sources
---
 flake.nix                                        | 14 +++++++++-----
 sources/{devkita64.json => devkita64-amd64.json} |  0
 sources/{devkitarm.json => devkitarm-amd64.json} |  0
 sources/{devkitppc.json => devkitppc-amd64.json} |  0
 update.sh                                        | 13 ++++++++-----
 5 files changed, 17 insertions(+), 10 deletions(-)
 rename sources/{devkita64.json => devkita64-amd64.json} (100%)
 rename sources/{devkitarm.json => devkitarm-amd64.json} (100%)
 rename sources/{devkitppc.json => devkitppc-amd64.json} (100%)

diff --git a/flake.nix b/flake.nix
index 0d9e85c..1263dd8 100755
--- a/flake.nix
+++ b/flake.nix
@@ -73,10 +73,14 @@
           };
         });
 
-      packages = pkgs: rec {
+      packages = pkgs: let
+        dockerArch = if pkgs.stdenv.hostPlatform.system == "x86_64-linux"
+          then "amd64"
+          else "arm64";
+      in rec {
         devkitA64 = mkDevkit pkgs {
           name = "devkitA64";
-          src = ./sources/devkita64.json;
+          src = ./sources/devkita64-${dockerArch}.json;
           includePaths = [
             "devkitA64"
             "devkitA64/aarch64-none-elf"
@@ -86,7 +90,7 @@
         };
         devkitARM = mkDevkit pkgs {
           name = "devkitARM";
-          src = ./sources/devkitarm.json;
+          src = ./sources/devkitarm-${dockerArch}.json;
           includePaths = [
             "devkitARM"
             "devkitARM/arm-none-eabi"
@@ -105,7 +109,7 @@
         };
         devkitPPC = mkDevkit pkgs {
           name = "devkitPPC";
-          src = ./sources/devkitppc.json;
+          src = ./sources/devkitppc-${dockerArch}.json;
           includePaths = [
             "devkitPPC"
             "devkitPPC/powerpc-eabi"
@@ -140,7 +144,7 @@
         } pkgs.stdenvNoCC;
       };
     in
-    (flake-utils.lib.eachDefaultSystem (
+    (flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ] (
       system:
       let
         pkgs' = nixpkgs.legacyPackages.${system};
diff --git a/sources/devkita64.json b/sources/devkita64-amd64.json
similarity index 100%
rename from sources/devkita64.json
rename to sources/devkita64-amd64.json
diff --git a/sources/devkitarm.json b/sources/devkitarm-amd64.json
similarity index 100%
rename from sources/devkitarm.json
rename to sources/devkitarm-amd64.json
diff --git a/sources/devkitppc.json b/sources/devkitppc-amd64.json
similarity index 100%
rename from sources/devkitppc.json
rename to sources/devkitppc-amd64.json
diff --git a/update.sh b/update.sh
index 2a0a0ed..cf42fbc 100755
--- a/update.sh
+++ b/update.sh
@@ -3,14 +3,17 @@
 # shellcheck shell=bash
 
 function fetch() {
-    echo "fetching $1..."
-    nix-prefetch-docker --image-name "devkitpro/$1" --json --quiet >"sources/$1.json"
+    echo "fetching $1-$2..."
+    nix-prefetch-docker --image-name "devkitpro/$1" --arch $2 --json --quiet >"sources/$1-$2.json"
 }
 
 fd flake.nix -x nix flake update --flake "{//}" --option access-tokens "github.com=$GITHUB_TOKEN"
 
 mkdir -p sources
 
-fetch devkitarm
-fetch devkita64
-fetch devkitppc
+fetch devkitarm amd64
+fetch devkitarm arm64
+fetch devkita64 amd64
+fetch devkita64 arm64
+fetch devkitppc amd64
+fetch devkitppc arm64