Author: egorochkin
Date: Sat Nov 13 07:47:04 2010
New Revision: 24681
URL: https://svn.nixos.org/websvn/nix/?rev=24681&sc=1
Log:
Spring RTS: packaged along with its deps and utils: libDevIL,
libtorrent-rasterbar, spring-lobby.
Added:
nixpkgs/trunk/pkgs/development/libraries/libdevil/
nixpkgs/trunk/pkgs/development/libraries/libdevil/default.nix
nixpkgs/trunk/pkgs/development/libraries/libtorrent-rasterbar/
nixpkgs/trunk/pkgs/development/libraries/libtorrent-rasterbar/default.nix
nixpkgs/trunk/pkgs/games/spring/
nixpkgs/trunk/pkgs/games/spring/default.nix
nixpkgs/trunk/pkgs/games/spring/gcc44.patch
nixpkgs/trunk/pkgs/games/spring/spring-lobby.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/libdevil/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/libdevil/default.nix Sat Nov
13 07:47:04 2010 (r24681)
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl
+, libjpeg ? null, libpng ? null, libmng ? null, lcms1 ? null, libtiff ? null,
openexr ? null, mesa ? null, xlibs ? null }:
+stdenv.mkDerivation rec {
+
+ name ="libdevil-${version}";
+ version = "1.7.8";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/openil/DevIL-${version}.tar.gz";
+ sha256 = "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8";
+ };
+
+ buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr mesa
xlibs.libX11 ];
+ configureFlags = [ "--enable-ILU" "--enable-ILUT" ];
+
+ meta = with stdenv.lib; {
+ homepage = http://openil.sourceforge.net/;
+ description = "An image library which can can load, save, convert,
manipulate,
+ filter and display a wide variety of image formats.";
+ license = licenses.lgpl2;
+ maintainers = [ maintainers.phreedom ];
+ };
+}
\ No newline at end of file
Added: nixpkgs/trunk/pkgs/development/libraries/libtorrent-rasterbar/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/libtorrent-rasterbar/default.nix
Sat Nov 13 07:47:04 2010 (r24681)
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, boost, openssl, pkgconfig, zlib }:
+
+stdenv.mkDerivation rec {
+ name = "libtorrent-rasterbar-${version}";
+ version = "0.15.4";
+
+ src = fetchurl {
+ url = "http://libtorrent.googlecode.com/files/${name}.tar.gz";;
+ sha256 = "1pjdn0as4h71bhm0fbjqsh1y10fbifn2hfrkhkgdsdqhz7vdbfwy";
+ };
+
+ buildInputs = [ boost pkgconfig openssl zlib ];
+
+ configureFlags = [ "--with-boost=${boost}/include/boost"
"--with-boost-libdir=${boost}/lib" ];
+
+ meta = with stdenv.lib; {
+ homepage = http://www.rasterbar.com/products/libtorrent/;
+ description = "A C++ BitTorrent implementation focusing on efficiency and
scalability";
+ license = licenses.bsd;
+ maintainers = [ maintainers.phreedom ];
+ };
+}
Added: nixpkgs/trunk/pkgs/games/spring/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/games/spring/default.nix Sat Nov 13 07:47:04 2010
(r24681)
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip
+, openal, libvorbis, glew, freetype, xlibs, SDL, mesa
+, jdk ? null, python ? null
+, withAI ? true # support for AI Interfaces and Skirmish AIs
+}:
+stdenv.mkDerivation rec {
+
+ name = "spring-${version}";
+ version = "0.82.6.1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/springrts/spring_${version}_src.tar.lzma";
+ sha256 = "1bi64jgc390sqc514scz80a0pdgc5n9kx45sppky2152y725900n";
+ };
+
+ buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis
freetype SDL
+ xlibs.libX11 xlibs.libXcursor mesa glew ]
+ ++ stdenv.lib.optional withAI jdk
+ ++ stdenv.lib.optional withAI python;
+
+ prePatch = ''
+ substituteInPlace cont/base/make_gamedata_arch.sh --replace "#!/bin/sh"
"#!${stdenv.shell}/bin/sh" \
+ --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 ];
+ };
+}
\ No newline at end of file
Added: nixpkgs/trunk/pkgs/games/spring/gcc44.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/games/spring/gcc44.patch Sat Nov 13 07:47:04 2010
(r24681)
@@ -0,0 +1,10 @@
+--- 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
+ {
Added: nixpkgs/trunk/pkgs/games/spring/spring-lobby.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/games/spring/spring-lobby.nix Sat Nov 13 07:47:04
2010 (r24681)
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, cmake, wxGTK, openal, pkgconfig, curl, libtorrentRasterbar
+, gettext, bash, gawk, boost }:
+stdenv.mkDerivation rec {
+
+ name = "spring-lobby-${version}";
+ version = "0.116";
+
+ src = fetchurl {
+ url =
"http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";;
+ sha256 = "04gb2dc2xc0lj2d14jzz330kn5faffdz3xph9bg2m68b28fv0xsk";
+ };
+
+ buildInputs = [ cmake wxGTK openal pkgconfig curl gettext
libtorrentRasterbar boost ];
+
+ prePatch = ''
+ substituteInPlace tools/regen_config_header.sh --replace "#!/bin/bash"
"#!${bash}/bin/bash"
+ substituteInPlace tools/test-susynclib.awk --replace "#!/usr/bin/awk"
"#!${gawk}/bin/awk"
+ substituteInPlace CMakeLists.txt --replace "boost_system-mt" "boost_system"
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = http://springlobby.info/;
+ description = "A free cross-platform lobby client for the Spring RTS
project.";
+ license = licenses.gpl2;
+ maintainers = [ maintainers.phreedom ];
+ platforms = platforms.linux;
+ };
+}
\ No newline at end of file
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Nov 12 22:02:08
2010 (r24680)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Nov 13 07:47:04
2010 (r24681)
@@ -3220,6 +3220,8 @@
inherit sqlite mysql;
};
+ libdevil = callPackage ../development/libraries/libdevil { };
+
libdiscid = callPackage ../development/libraries/libdiscid { };
libdv = callPackage ../development/libraries/libdv { };
@@ -3435,6 +3437,8 @@
libtommath = callPackage ../development/libraries/libtommath { };
+ libtorrentRasterbar = callPackage
../development/libraries/libtorrent-rasterbar { };
+
libtunepimp = callPackage ../development/libraries/libtunepimp { };
libgeotiff = callPackage ../development/libraries/libgeotiff { };
@@ -6630,6 +6634,14 @@
spaceOrbit = callPackage ../games/orbit {
inherit (gnome) esound; };
+ spring = callPackage ../games/spring {
+ stdenv = stdenv2;
+ };
+
+ springLobby = callPackage ../games/spring/spring-lobby.nix {
+ stdenv = stdenv2;
+ };
+
superTux = callPackage ../games/super-tux { };
superTuxKart = callPackage ../games/super-tux-kart { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
