Merge pull request #14971 from rardiol/the-powder-toy

the-powder-toy: 90.2.322 -> 91.3.328

pkgs/games/the-powder-toy/default.nix

@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, scons, pkgconfig, SDL, lua, fftwFloat }:
 
-let version = "90.2.322";
+let version = "91.3.328";
 in
 stdenv.mkDerivation rec {
   name = "the-powder-toy-${version}";
   src = fetchFromGitHub {
     owner = "simtr";
     repo = "The-Powder-Toy";
     rev = "v${version}";
-    sha256 = "1rlxnk8icymalnr3j4bgpklq1dhhs0rpsyjx97isqqcwm2ys03q3";
+    sha256 = "0krg4d2m8cnfabm5qq7wr1y53h21i49xjcggzg98xjd0972zvfrk";
   };
 
   patches = [ ./fix-env.patch ];

pkgs/games/the-powder-toy/fix-env.patch

@@ -1,16 +1,11 @@
-diff --git a/SConscript b/SConscript
-index fd08935..4d879b2 100644
 --- a/SConscript
 +++ b/SConscript
-@@ -93,9 +93,9 @@ if msvc and platform != "Windows":
-
- #Create SCons Environment
- if platform == "Windows" and not GetOption('msvc'):
--	env = Environment(tools = ['mingw'], ENV = {'PATH' : os.environ['PATH']})
-+	env = Environment(tools = ['mingw'], ENV = os.environ)
- else:
--	env = Environment(tools = ['default'], ENV = {'PATH' : os.environ['PATH']})
-+	env = Environment(tools = ['default'], ENV = os.environ)
-
- #attempt to automatically find cross compiler
- if not tool and compilePlatform == "Linux" and compilePlatform != platform:
+@@ -99,7 +99,7 @@
+ elif platform == "Windows" and not GetOption('msvc'):
+ 	env = Environment(tools=['mingw'], ENV={'PATH' : os.environ['PATH']})
+ else:
+-	env = Environment(tools=['default'], ENV={'PATH' : os.environ['PATH']})
++	env = Environment(tools=['default'], ENV = os.environ)
+
+ #attempt to automatically find cross compiler
+ if not tool and compilePlatform == "Linux" and compilePlatform != platform: