From eb2ade40d17d3ef97b90b431e7e79bbac4e6e070 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 25 Mar 2023 18:39:03 +0200
Subject: [PATCH] treewide: migrate more packages to scons_latest

---
 pkgs/development/tools/godot/3/default.nix | 2 +-
 pkgs/development/tools/godot/4/default.nix | 2 +-
 pkgs/top-level/all-packages.nix            | 8 ++------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/godot/3/default.nix b/pkgs/development/tools/godot/3/default.nix
index 97c9786e8fd2..f4d1a1ae5b41 100644
--- a/pkgs/development/tools/godot/3/default.nix
+++ b/pkgs/development/tools/godot/3/default.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
     homepage = "https://godotengine.org";
     description = "Free and Open Source 2D and 3D game engine";
     license = licenses.mit;
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
     maintainers = with maintainers; [ twey ];
   };
 }
diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix
index e3cc35ef90a5..3730945b9966 100644
--- a/pkgs/development/tools/godot/4/default.nix
+++ b/pkgs/development/tools/godot/4/default.nix
@@ -125,7 +125,7 @@ stdenv.mkDerivation rec {
     homepage = "https://godotengine.org";
     description = "Free and Open Source 2D and 3D game engine";
     license = licenses.mit;
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
     maintainers = with maintainers; [ twey shiryel ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78ab9e31f0d8..dcae0062d5da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7900,13 +7900,9 @@ with pkgs;
 
   gocryptfs = callPackage ../tools/filesystems/gocryptfs { };
 
-  godot_4 = callPackage ../development/tools/godot/4 {
-    scons = sconsPackages.scons_4_1_0;
-  };
+  godot_4 = callPackage ../development/tools/godot/4 { };
 
-  godot = callPackage ../development/tools/godot/3 {
-    scons = sconsPackages.scons_4_1_0;
-  };
+  godot = callPackage ../development/tools/godot/3 { };
 
   godot-export-templates = callPackage ../development/tools/godot/3/export-templates.nix { };