Making btanks work (and adding smpeg).

svn path=/nixpkgs/trunk/; revision=26585

pkgs/development/libraries/smpeg/default.nix

@@ -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+";
+  };
+}

pkgs/games/btanks/default.nix

@@ -1,6 +1,4 @@
-{stdenv, fetchurl, scons, pkgconfig, SDL, mesa, zlib }:
+{stdenv, fetchurl, scons, pkgconfig, SDL, mesa, zlib, smpeg, SDL_image, libvorbis, lua5, zip }:
-
-throw "Still does not build. It needs smpeg"
 
 stdenv.mkDerivation rec {
   name = "battle-tanks-0.9.8083";
@@ -10,12 +8,15 @@ stdenv.mkDerivation rec {
     sha256 = "0ha35kxc8xlbg74wsrbapfgxvcrwy6psjkqi7c6adxs55dmcxliz";
   };
 
-  /* It still does not build */
+  buildInputs = [ scons pkgconfig SDL mesa zlib smpeg SDL_image libvorbis lua5
-  buildInputs = [ scons pkgconfig SDL mesa zlib ];
+    zip ];
+
+  buildPhase = ''
+    scons prefix=$out
+  '';
 
   installPhase = ''
-    scons PREFIX=$out
+    scons install
-    scons PREFIX=$out install
   '';
 
   meta = {

pkgs/top-level/all-packages.nix

@@ -4075,6 +4075,8 @@ let
     scheme = guile;
   };
 
+  smpeg = callPackage ../development/libraries/smpeg { };
+
   snack = callPackage ../development/libraries/snack {
         # optional
   };