Unverified Commit 03b6ad65 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #223092 from wegank/godot-test 

treewide: migrate more packages to scons_latest
parents fe9d8501 eb2ade40

pkgs/development/tools/godot/3/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 ];

  };

}

pkgs/development/tools/godot/4/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 ];

  };

}

pkgs/top-level/all-packages.nix

+2 −6
Original line number Diff line number Diff line
@@ -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 { };