Author: viric Date: 2010-07-07 21:44:09 +0000 (Wed, 07 Jul 2010) New Revision: 22519
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22519&view=rev Added: nixpkgs/trunk/pkgs/development/libraries/SDL_sound/ nixpkgs/trunk/pkgs/development/libraries/SDL_sound/default.nix nixpkgs/trunk/pkgs/games/gltron/ nixpkgs/trunk/pkgs/games/gltron/gentoo-prototypes.patch Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix Log: Adding gltron. Changes: Added: nixpkgs/trunk/pkgs/development/libraries/SDL_sound/default.nix =================================================================== --- nixpkgs/trunk/pkgs/development/libraries/SDL_sound/default.nix (rev 0) +++ nixpkgs/trunk/pkgs/development/libraries/SDL_sound/default.nix 2010-07-07 21:44:09 UTC (rev 22519) @@ -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"; + }; +} Added: nixpkgs/trunk/pkgs/games/gltron/gentoo-prototypes.patch =================================================================== --- nixpkgs/trunk/pkgs/games/gltron/gentoo-prototypes.patch (rev 0) +++ nixpkgs/trunk/pkgs/games/gltron/gentoo-prototypes.patch 2010-07-07 21:44:09 UTC (rev 22519) @@ -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); Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix =================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-07-07 21:11:07 UTC (rev 22518) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-07-07 21:44:09 UTC (rev 22519) @@ -5334,6 +5334,10 @@ 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 @@ 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; }; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
