Unverified Commit 83ca608f authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #222960 from wegank/scons-latest

scons: default to latest
parents ce5ac8b0 1935178d
Loading
Loading
Loading
Loading
+16 −6
Original line number Diff line number Diff line
@@ -7900,9 +7900,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 { };
@@ -11741,7 +11745,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 { };
@@ -18759,7 +18765,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 { };
@@ -28878,7 +28884,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 { };
@@ -35508,7 +35516,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