diff options
| author | Ricardo Ardissone <ricardo.ardissone@gmail.com> | 2016-04-25 10:15:44 -0300 |
|---|---|---|
| committer | Ricardo Ardissone <ricardo.ardissone@gmail.com> | 2016-04-25 10:15:44 -0300 |
| commit | a51da701890fea2d41b58ec1c7142225060f6775 (patch) | |
| tree | 6e34b5b64eb955fbbb93fd57762c9e5c2a894caf /pkgs/games/the-powder-toy | |
| parent | 268ae334d996574614bfa5678273f30eda9fe278 (diff) | |
| download | nixpkgs-a51da701890fea2d41b58ec1c7142225060f6775.tar nixpkgs-a51da701890fea2d41b58ec1c7142225060f6775.tar.gz nixpkgs-a51da701890fea2d41b58ec1c7142225060f6775.tar.bz2 nixpkgs-a51da701890fea2d41b58ec1c7142225060f6775.tar.lz nixpkgs-a51da701890fea2d41b58ec1c7142225060f6775.tar.xz nixpkgs-a51da701890fea2d41b58ec1c7142225060f6775.tar.zst nixpkgs-a51da701890fea2d41b58ec1c7142225060f6775.zip | |
the-powder-toy: 90.2.322 -> 91.3.328
Diffstat (limited to 'pkgs/games/the-powder-toy')
| -rw-r--r-- | pkgs/games/the-powder-toy/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/the-powder-toy/fix-env.patch | 23 |
2 files changed, 11 insertions, 16 deletions
diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index f79d31c7c5c..14f05f8f1a8 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -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 ]; diff --git a/pkgs/games/the-powder-toy/fix-env.patch b/pkgs/games/the-powder-toy/fix-env.patch index 79d2bb2a2e0..b09fd4dcbe9 100644 --- a/pkgs/games/the-powder-toy/fix-env.patch +++ b/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: |