From 1935178de81e9cd0c19ca6311a9e4dab135bb805 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 25 Mar 2023 00:23:27 +0200
Subject: [PATCH] scons: default to latest

---
 pkgs/top-level/all-packages.nix | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d268f62325bd..02c97ef4960f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7935,9 +7935,13 @@ with pkgs;
 
   gocryptfs = callPackage ../tools/filesystems/gocryptfs { };
 
-  godot_4 = callPackage ../development/tools/godot/4 { };
+  godot_4 = callPackage ../development/tools/godot/4 {
+    scons = sconsPackages.scons_4_1_0;
+  };
 
-  godot = callPackage ../development/tools/godot/3 { };
+  godot = callPackage ../development/tools/godot/3 {
+    scons = sconsPackages.scons_4_1_0;
+  };
 
   godot-export-templates = callPackage ../development/tools/godot/3/export-templates.nix { };
 
@@ -11776,7 +11780,9 @@ with pkgs;
 
   rmtrash = callPackage ../tools/misc/rmtrash { };
 
-  roc-toolkit = callPackage ../development/libraries/audio/roc-toolkit { };
+  roc-toolkit = callPackage ../development/libraries/audio/roc-toolkit {
+    scons = sconsPackages.scons_4_1_0;
+  };
 
   rockbox-utility = libsForQt5.callPackage ../tools/misc/rockbox-utility { };
 
@@ -18794,7 +18800,7 @@ with pkgs;
   semantik = libsForQt5.callPackage ../applications/office/semantik { };
 
   sconsPackages = dontRecurseIntoAttrs (callPackage ../development/tools/build-managers/scons { });
-  scons = sconsPackages.scons_4_1_0;
+  scons = sconsPackages.scons_latest;
 
   mill = callPackage ../development/tools/build-managers/mill { };
 
@@ -28911,7 +28917,9 @@ with pkgs;
 
   bombadillo = callPackage ../applications/networking/browsers/bombadillo { };
 
-  bombono = callPackage ../applications/video/bombono { };
+  bombono = callPackage ../applications/video/bombono {
+    scons = sconsPackages.scons_4_1_0;
+  };
 
   bonzomatic = callPackage ../applications/editors/bonzomatic { };
 
@@ -35537,7 +35545,9 @@ with pkgs;
 
   dwarf-therapist = dwarf-fortress-packages.dwarf-therapist;
 
-  dxx-rebirth = callPackage ../games/dxx-rebirth { };
+  dxx-rebirth = callPackage ../games/dxx-rebirth {
+    scons = sconsPackages.scons_4_1_0;
+  };
 
   inherit (callPackages ../games/dxx-rebirth/assets.nix { })
     descent1-assets