BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

scons: 3.1.2 -> 4.0.0

Browse source
This commit is contained in:
Michael Weiss 2020-07-07 20:13:43 +02:00
parent a3a40ac7cc
commit d41cd156d0
No known key found for this signature in database
GPG key ID: 5BE487C4D4771D83
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/tools/build-managers/scons/common.nix
View file

@ -1,6 +1,6 @@
{ version, sha256 }:
{ stdenv, fetchurl, python3Packages, python2Packages, scons }:
{ stdenv, fetchurl, python3Packages, lib }:
python3Packages.buildPythonApplication rec {
pname = "scons";
@ -13,7 +13,13 @@ python3Packages.buildPythonApplication rec {
setupHook = ./setup-hook.sh;
passthru.py2 = scons.override { python3Packages = python2Packages; };
postPatch = lib.optionalString (lib.versionAtLeast version "4.0.0") ''
substituteInPlace setup.cfg \
--replace "build/dist" "dist"
'';
# TODO: "Invalid SConscript usage - no parameters":
doCheck = lib.versionOlder version "4.0.0";
meta = with stdenv.lib; {
description = "An improved, cross-platform substitute for Make";

6
pkgs/development/tools/build-managers/scons/default.nix
View file

@ -7,8 +7,12 @@ in {
version = "3.0.1";
sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4";
}).override { python3Packages = python2Packages; };
scons_latest = mkScons {
scons_3_1_2 = (mkScons {
version = "3.1.2";
sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq";
}).override { python3Packages = python2Packages; };
scons_latest = mkScons {
version = "4.0.0";
sha256 = "1ikw5lh0h206xd74g39jdlrcicb18jj3j80hvm4nbrfgxv1hvibc";
};
}