pyrox.dev
Merge pull request #14971 from rardiol/the-powder-toy
the-powder-toy: 90.2.322 -> 91.3.328
+2
-2
pkgs/games/the-powder-toy/default.nix
+2
-2
pkgs/games/the-powder-toy/default.nix
···
1
1
{ stdenv, fetchFromGitHub, scons, pkgconfig, SDL, lua, fftwFloat }:
2
2
3
-
let version = "90.2.322";
3
+
let version = "91.3.328";
4
4
in
5
5
stdenv.mkDerivation rec {
6
6
name = "the-powder-toy-${version}";
···
8
8
owner = "simtr";
9
9
repo = "The-Powder-Toy";
10
10
rev = "v${version}";
11
-
sha256 = "1rlxnk8icymalnr3j4bgpklq1dhhs0rpsyjx97isqqcwm2ys03q3";
11
+
sha256 = "0krg4d2m8cnfabm5qq7wr1y53h21i49xjcggzg98xjd0972zvfrk";
12
12
};
13
13
14
14
patches = [ ./fix-env.patch ];
+9
-14
pkgs/games/the-powder-toy/fix-env.patch
+9
-14
pkgs/games/the-powder-toy/fix-env.patch
···
1
-
diff --git a/SConscript b/SConscript
2
-
index fd08935..4d879b2 100644
3
1
--- a/SConscript
4
2
+++ b/SConscript
5
-
@@ -93,9 +93,9 @@ if msvc and platform != "Windows":
6
-
7
-
#Create SCons Environment
8
-
if platform == "Windows" and not GetOption('msvc'):
9
-
- env = Environment(tools = ['mingw'], ENV = {'PATH' : os.environ['PATH']})
10
-
+ env = Environment(tools = ['mingw'], ENV = os.environ)
11
-
else:
12
-
- env = Environment(tools = ['default'], ENV = {'PATH' : os.environ['PATH']})
13
-
+ env = Environment(tools = ['default'], ENV = os.environ)
14
-
15
-
#attempt to automatically find cross compiler
16
-
if not tool and compilePlatform == "Linux" and compilePlatform != platform:
3
+
@@ -99,7 +99,7 @@
4
+
elif platform == "Windows" and not GetOption('msvc'):
5
+
env = Environment(tools=['mingw'], ENV={'PATH' : os.environ['PATH']})
6
+
else:
7
+
- env = Environment(tools=['default'], ENV={'PATH' : os.environ['PATH']})
8
+
+ env = Environment(tools=['default'], ENV = os.environ)
9
+
10
+
#attempt to automatically find cross compiler
11
+
if not tool and compilePlatform == "Linux" and compilePlatform != platform: