b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #222960 from wegank/scons-latest

Browse source 
scons: default to latest
This commit is contained in:
Weijia Wang 2023-03-25 16:29:09 +02:00 committed by GitHub
parent ce5ac8b05f 1935178de8
commit 83ca608f36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkgs/top-level/all-packages.nix
View file

@ -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