tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
0
fork
atom
lol
0
fork
atom
overview
issues
pulls
pipelines
sconsPackages.scons_latest: 4.1.0 -> 4.5.2
Weijia Wang
3 years ago
9cce4017
fea3fca2
+24
-3
4 changed files
expand all
collapse all
unified
split
pkgs
development
tools
build-managers
scons
common.nix
default.nix
env.patch
top-level
all-packages.nix
+9
-1
pkgs/development/tools/build-managers/scons/common.nix
···
7
7
inherit version;
8
8
9
9
src = fetchurl {
10
10
-
url = "mirror://sourceforge/scons/${pname}-${version}.tar.gz";
10
10
+
url =
11
11
+
if lib.versionAtLeast version "4.3.0" then
12
12
+
"mirror://sourceforge/project/scons/scons/${version}/SCons-${version}.tar.gz"
13
13
+
else
14
14
+
"mirror://sourceforge/scons/scons-${version}.tar.gz";
11
15
inherit sha256;
12
16
};
13
17
14
18
setupHook = ./setup-hook.sh;
19
19
+
20
20
+
patches = lib.optionals (lib.versionAtLeast version "4.3.0") [
21
21
+
./env.patch
22
22
+
];
15
23
16
24
postPatch = lib.optionalString (lib.versionAtLeast version "4.0.0") ''
17
25
substituteInPlace setup.cfg \
+5
-1
pkgs/development/tools/build-managers/scons/default.nix
···
9
9
version = "3.1.2";
10
10
sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq";
11
11
});
12
12
-
scons_latest = mkScons {
12
12
+
scons_4_1_0 = mkScons {
13
13
version = "4.1.0";
14
14
sha256 = "11axk03142ziax6i3wwy9qpqp7r3i7h5jg9y2xzph9i15rv8vlkj";
15
15
+
};
16
16
+
scons_latest = mkScons {
17
17
+
version = "4.5.2";
18
18
+
sha256 = "sha256-ziaqyV01CnmkGSGWsL6sPLJPTMq84BI+so0zcPV28HI=";
15
19
};
16
20
}
+9
pkgs/development/tools/build-managers/scons/env.patch
···
1
1
+
diff --git a/SCons/Platform/posix.py b/SCons/Platform/posix.py
2
2
+
index 4c9f8f9ba..d68da1b08 100644
3
3
+
--- a/SCons/Platform/posix.py
4
4
+
+++ b/SCons/Platform/posix.py
5
5
+
@@ -30,0 +31 @@ selection method.
6
6
+
+import os
7
7
+
@@ -87 +88 @@ def generate(env):
8
8
+
- env['ENV']['PATH'] = '/usr/local/bin:/opt/bin:/bin:/usr/bin:/snap/bin'
9
9
+
+ env['ENV']['PATH'] = os.environ["PATH"]
+1
-1
pkgs/top-level/all-packages.nix
···
18798
18798
semantik = libsForQt5.callPackage ../applications/office/semantik { };
18799
18799
18800
18800
sconsPackages = dontRecurseIntoAttrs (callPackage ../development/tools/build-managers/scons { });
18801
18801
-
scons = sconsPackages.scons_latest;
18801
18801
+
scons = sconsPackages.scons_4_1_0;
18802
18802
18803
18803
mill = callPackage ../development/tools/build-managers/mill { };
18804
18804