From 4ecebb6465bf117922c05dc350a8c04cb9526d4c Mon Sep 17 00:00:00 2001 From: LluĂ­s Batlle i Rossell Date: Tue, 24 Aug 2010 19:59:06 +0000 Subject: Updating xmoto svn path=/nixpkgs/trunk/; revision=23409 --- pkgs/games/xmoto/64bit-ftbs.patch | 12 ------------ pkgs/games/xmoto/default.nix | 4 +--- pkgs/games/xmoto/src-for-default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 pkgs/games/xmoto/64bit-ftbs.patch diff --git a/pkgs/games/xmoto/64bit-ftbs.patch b/pkgs/games/xmoto/64bit-ftbs.patch deleted file mode 100644 index 037c026e4e6..00000000000 --- a/pkgs/games/xmoto/64bit-ftbs.patch +++ /dev/null @@ -1,12 +0,0 @@ -From debian: https://launchpad.net/ubuntu/karmic/+source/xmoto/0.5.2-2 ---- a/src/Replay.cpp -+++ b/src/Replay.cpp -@@ -156,7 +156,7 @@ - v_replay.writeBuf(pcData, nDataSize); - - /* Chunks */ -- v_replay << m_Chunks.size(); -+ v_replay << (unsigned int)m_Chunks.size(); - for(unsigned int i=0;inNumStates; - v_replay.writeBuf(m_Chunks[i]->pcChunkData, m_nStateSize * m_Chunks[i]->nNumStates); diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix index 971d29584c1..7ddbcc7de0f 100644 --- a/pkgs/games/xmoto/default.nix +++ b/pkgs/games/xmoto/default.nix @@ -4,7 +4,7 @@ let buildInputs = with a; [ chipmunk sqlite curl zlib bzip2 libjpeg libpng freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf - lua5 ode + lua5 ode libxdg_basedir ]; in rec { @@ -17,8 +17,6 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = [ "doPatch" "doConfigure" "doMakeInstall"]; - patches = [ ./64bit-ftbs.patch ]; - meta = { description = "X-Moto - obstacled race game"; maintainers = [ diff --git a/pkgs/games/xmoto/src-for-default.nix b/pkgs/games/xmoto/src-for-default.nix index bc024263c22..4250450617a 100644 --- a/pkgs/games/xmoto/src-for-default.nix +++ b/pkgs/games/xmoto/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="0.5.2"; - name="xmoto-0.5.2"; - hash="13q5b0a1ha5am3p2b7a399ca7vnw4fs82y96aw0n96s3xmw17jd8"; + version="0.5.3"; + name="xmoto-0.5.3"; + hash="1xqz1x4q75469s1m6qqy5akbh62327p30267ca5ivjff59wpcfyf"; url="http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz"; - advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.2/xmoto-0.5.2-src.tar.gz"; + advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.3/xmoto-0.5.3-src.tar.gz"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8120383f00..2a94391c467 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4961,7 +4961,7 @@ let xmoto = builderDefsPackage (import ../games/xmoto) { inherit chipmunk sqlite curl zlib bzip2 libjpeg libpng freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf - lua5 ode; + lua5 ode libxdg_basedir; }; xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { }; -- cgit 1.4.1