JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
the-powder-toy: 90.2.322 -> 91.3.328
This commit is contained in:
Nikolay Amiantov 2016-04-25 18:43:48 +04:00
commit 559a563208
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/games/the-powder-toy/default.nix
View File

@ -1,6 +1,6 @@
{ 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}";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
owner = "simtr";
repo = "The-Powder-Toy";
rev = "v${version}";
sha256 = "1rlxnk8icymalnr3j4bgpklq1dhhs0rpsyjx97isqqcwm2ys03q3";
sha256 = "0krg4d2m8cnfabm5qq7wr1y53h21i49xjcggzg98xjd0972zvfrk";
};
patches = [ ./fix-env.patch ];

23
pkgs/games/the-powder-toy/fix-env.patch
View File

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