Author: viric
Date: Mon Mar 28 18:58:49 2011
New Revision: 26585
URL: https://svn.nixos.org/websvn/nix/?rev=26585&sc=1
Log:
Making btanks work (and adding smpeg).
Added:
nixpkgs/trunk/pkgs/development/libraries/smpeg/
nixpkgs/trunk/pkgs/development/libraries/smpeg/default.nix
Modified:
nixpkgs/trunk/pkgs/games/btanks/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/smpeg/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/smpeg/default.nix Mon Mar 28
18:58:49 2011 (r26585)
@@ -0,0 +1,34 @@
+{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk, m4, pkgconfig, mesa
}:
+
+stdenv.mkDerivation rec {
+ name = "smpeg-svn-${version}";
+ version = "390";
+
+ src = fetchsvn {
+ url = svn://svn.icculus.org/smpeg/trunk;
+ rev = version;
+ sha256 = "0ynwn7ih5l2b1kpzpibns9bb9wzfjak7mgrb1ji0dkn2q5pv6lr0";
+ };
+
+ buildInputs = [ SDL autoconf automake libtool gtk m4 pkgconfig mesa ];
+
+ preConfigure = ''
+ touch NEWS AUTHORS ChangeLog
+ autoreconf -fvi -I acinclude
+ '';
+
+ postInstall = ''
+ sed -i -e 's,"SDL.h",<SDL/SDL.h>,' \
+ -e 's,"SDL_mutex.h",<SDL/SDL_mutex.h>,' \
+ -e 's,"SDL_audio.h",<SDL/SDL_audio.h>,' \
+ -e 's,"SDL_thread.h",<SDL/SDL_thread.h>,' \
+ -e 's,"SDL_types.h",<SDL/SDL_types.h>,' \
+ $out/include/smpeg/*.h
+ '';
+
+ meta = {
+ homepage = http://icculus.org/smpeg/;
+ description = "MPEG decoding library";
+ license = "GPLv2+";
+ };
+}
Modified: nixpkgs/trunk/pkgs/games/btanks/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/games/btanks/default.nix Mon Mar 28 18:12:32 2011
(r26584)
+++ nixpkgs/trunk/pkgs/games/btanks/default.nix Mon Mar 28 18:58:49 2011
(r26585)
@@ -1,6 +1,4 @@
-{stdenv, fetchurl, scons, pkgconfig, SDL, mesa, zlib }:
-
-throw "Still does not build. It needs smpeg"
+{stdenv, fetchurl, scons, pkgconfig, SDL, mesa, zlib, smpeg, SDL_image,
libvorbis, lua5, zip }:
stdenv.mkDerivation rec {
name = "battle-tanks-0.9.8083";
@@ -10,12 +8,15 @@
sha256 = "0ha35kxc8xlbg74wsrbapfgxvcrwy6psjkqi7c6adxs55dmcxliz";
};
- /* It still does not build */
- buildInputs = [ scons pkgconfig SDL mesa zlib ];
+ buildInputs = [ scons pkgconfig SDL mesa zlib smpeg SDL_image libvorbis lua5
+ zip ];
+
+ buildPhase = ''
+ scons prefix=$out
+ '';
installPhase = ''
- scons PREFIX=$out
- scons PREFIX=$out install
+ scons install
'';
meta = {
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Mar 28 18:12:32
2011 (r26584)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Mar 28 18:58:49
2011 (r26585)
@@ -4075,6 +4075,8 @@
scheme = guile;
};
+ smpeg = callPackage ../development/libraries/smpeg { };
+
snack = callPackage ../development/libraries/snack {
# optional
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
