diff options
| author | Joachim Schiele <js@lastlog.de> | 2012-03-12 15:11:37 +0000 |
|---|---|---|
| committer | Joachim Schiele <js@lastlog.de> | 2012-03-12 15:11:37 +0000 |
| commit | 5b6856ff5279a600e3faaa7074d61854a31d2293 (patch) | |
| tree | d1d30cb01931fbcba905b261dd5a535a9199f4d4 /pkgs/games | |
| parent | dd90a8b709cbb678c6d159b9f30af73c8130f194 (diff) | |
| download | nixlib-5b6856ff5279a600e3faaa7074d61854a31d2293.tar nixlib-5b6856ff5279a600e3faaa7074d61854a31d2293.tar.gz nixlib-5b6856ff5279a600e3faaa7074d61854a31d2293.tar.bz2 nixlib-5b6856ff5279a600e3faaa7074d61854a31d2293.tar.lz nixlib-5b6856ff5279a600e3faaa7074d61854a31d2293.tar.xz nixlib-5b6856ff5279a600e3faaa7074d61854a31d2293.tar.zst nixlib-5b6856ff5279a600e3faaa7074d61854a31d2293.zip | |
new version of spring is there
svn path=/nixpkgs/trunk/; revision=33019
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/spring/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/games/spring/gcc44.patch | 10 |
2 files changed, 2 insertions, 14 deletions
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index da07f14b6738..58809711b044 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "spring-${version}"; - version = "0.86.0"; + version = "0.87.0"; src = fetchurl { url = "mirror://sourceforge/springrts/spring_86.0_src.tar.lzma"; @@ -23,15 +23,13 @@ stdenv.mkDerivation rec { --replace "which" "type -p" ''; - #patches = [ ./gcc44.patch]; - enableParallelBuilding = true; meta = with stdenv.lib; { homepage = http://springrts.com/; description = "A powerful real-time strategy(RTS) game engine"; license = licenses.gpl2; - maintainers = [ maintainers.phreedom ]; + maintainers = [ maintainers.phreedom maintainers.qknight ]; platforms = platforms.unix; }; } diff --git a/pkgs/games/spring/gcc44.patch b/pkgs/games/spring/gcc44.patch deleted file mode 100644 index 4df1e6e825ff..000000000000 --- a/pkgs/games/spring/gcc44.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- spring_0.82.6.1-orig/rts/lib/lobby/Connection.h 2010-10-15 23:08:24.000000000 +0300 -+++ spring_0.82.6.1/rts/lib/lobby/Connection.h 2010-11-11 14:48:55.000000000 +0200 -@@ -7,6 +7,7 @@ - #include <boost/asio/deadline_timer.hpp> - #include <boost/asio/ip/tcp.hpp> - #include <string> -+#include <list> - - struct ClientStatus - { |