Adding gltron.

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

3 files changed, 53 insertions, 0 deletions

diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/pkgs/development/libraries/SDL_sound/default.nix
new file mode 100644
index 000000000000..624faacde4f2
--- /dev/null
+++ b/pkgs/development/libraries/SDL_sound/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, SDL, libvorbis, flac, libmikmod}:
+
+stdenv.mkDerivation rec {
+  name = "SDL_sound-1.0.3";
+
+  src = fetchurl {
+    url = "http://icculus.org/SDL_sound/downloads/${name}.tar.gz";
+    sha256 = "1pz6g56gcy7pmmz3hhych3iq9jvinml2yjz15fjqjlj8pc5zv69r";
+  };
+
+  buildInputs = [ SDL libvorbis flac libmikmod ];
+
+  postInstall = "ln -s $out/include/SDL/SDL_sound.h $out/include/";
+
+  meta = {
+    description = "SDL sound library";
+  };
+}
diff --git a/pkgs/games/gltron/gentoo-prototypes.patch b/pkgs/games/gltron/gentoo-prototypes.patch
new file mode 100644
index 000000000000..71078ae553f7
--- /dev/null
+++ b/pkgs/games/gltron/gentoo-prototypes.patch
@@ -0,0 +1,27 @@
+Taken from:
+http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/games-action/gltron/files/gltron-0.70-prototypes.patch?revision=1.1&view=markup
+
+scripting.h declares these params as const so make sure they're the same.
+
+--- a/nebu/scripting/scripting.c
++++ b/nebu/scripting/scripting.c
+@@ -169,16 +169,16 @@
+   return status;
+ }    
+ 
+-void scripting_RunFile(char *name) {
++void scripting_RunFile(const char *name) {
+   lua_dofile(L, name);
+ }
+ 
+-void scripting_Run(char *command) {
++void scripting_Run(const char *command) {
+   /* fprintf(stderr, "[command] %s\n", command); */
+   lua_dostring(L, command);
+ }
+ 
+-void scripting_RunFormat(char *format, ... ) {
++void scripting_RunFormat(const char *format, ... ) {
+   char buf[4096];
+   va_list ap;
+   va_start(ap, format);
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f53ece7c8c87..6fccca3d1ac2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5334,6 +5334,10 @@ let
     inherit fetchurl stdenv SDL;
   };
 
+  SDL_sound = import ../development/libraries/SDL_sound {
+    inherit fetchurl stdenv SDL libvorbis flac libmikmod;
+  };
+
   SDL_ttf = import ../development/libraries/SDL_ttf {
     inherit fetchurl stdenv SDL freetype;
   };
@@ -9245,6 +9249,10 @@ let
     inherit fetchurl stdenv SDL openal freealut zlib libpng python;
   };
 
+  gltron = import ../games/gltron {
+    inherit fetchurl stdenv mesa SDL zlib libpng libmikmod libvorbis SDL_sound;
+  };
+
   gnuchess = builderDefsPackage (import ../games/gnuchess) {
     flex = flex2535;
   };