diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-03-25 20:05:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-25 20:05:15 +0200 |
commit | 03b6ad65f3e62ed36d0982b1022d0a97bd9ccf4c (patch) | |
tree | c8fbab1e92e29075e4a388d917c7022aeecc32c9 /pkgs | |
parent | fe9d8501bae992842ad413ae386e07cd52df25c1 (diff) | |
parent | eb2ade40d17d3ef97b90b431e7e79bbac4e6e070 (diff) |
Merge pull request #223092 from wegank/godot-test
treewide: migrate more packages to scons_latest
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/tools/godot/3/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/godot/4/default.nix | 2 | ||||
-rw-r--r-- | 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 97c9786e8fd22..f4d1a1ae5b41a 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 4805399b5914a..4e329ec808393 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 cb1d70363aeb5..b8b6bf7404265 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 { }; |