xmoto: refactor, remove patches and add myself to maintainers

This commit is contained in:
Pascal Wittmann 2015-05-02 23:13:26 +02:00
parent 2fee606d86
commit ca03cf5c70
4 changed files with 20 additions and 46 deletions

View file

@ -1,32 +1,26 @@
a :
let
s = import ./src-for-default.nix;
buildInputs = with a; [
{ stdenv, fetchurl, chipmunk, sqlite, curl, zlib, bzip2, libjpeg
, libpng, freeglut, mesa, SDL, SDL_mixer, SDL_image, SDL_net
, SDL_ttf, lua5, ode, libxdg_basedir, libxml2 }:
stdenv.mkDerivation rec {
name = "xmoto-${version}";
version = "0.5.11";
src = fetchurl {
url = "http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz";
sha256 = "1ci6r8zd0l7z28cy92ddf9dmqbdqwinz2y1cny34c61b57wsd155";
};
buildInputs = [
chipmunk sqlite curl zlib bzip2 libjpeg libpng
freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf
lua5 ode libxdg_basedir libxml2
];
in
rec {
src = a.fetchUrlFromSrcInfo s;
inherit (s) name;
inherit buildInputs;
configureFlags = [];
/* doConfigure should be removed if not needed */
phaseNames = [ "patchIncludes" "doConfigure" "doMakeInstall"];
patchIncludes = a.fullDepEntry ''
sed -e '1i#include <sys/types.h>' -i src/helpers//System.cpp
sed -e '1i#include <unistd.h>' -i src/helpers//System.cpp
'' ["doUnpack" "minInit"];
meta = {
description = "X-Moto - obstacled race game";
maintainers = [
a.lib.maintainers.raskin
a.lib.maintainers.viric
];
platforms = a.lib.platforms.linux;
meta = with stdenv.lib; {
description = "Obstacled race game";
homepage = http://xmoto.tuxfamily.org;
maintainers = with maintainers; [ raskin viric pSub ];
platforms = platforms.linux;
};
}

View file

@ -1,9 +0,0 @@
rec {
version="0.5.11";
name="xmoto-0.5.11";
hash="1ci6r8zd0l7z28cy92ddf9dmqbdqwinz2y1cny34c61b57wsd155";
url="http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz";
advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.11/xmoto-0.5.11-src.tar.gz";
}

View file

@ -1,7 +0,0 @@
{
downloadPage = "http://xmoto.tuxfamily.org/";
baseName = "xmoto";
sourceRegexp = "xmoto-.*-src[.]tar[.].*";
versionExtractorSedScript = ''$dashDelimitedVersion'';
versionReferenceCreator=''$(replaceAllVersionOccurences)'';
}

View file

@ -9851,11 +9851,7 @@ let
xf86_video_nouveau = xorg.xf86videonouveau;
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 libxdg_basedir libxml2;
};
xmoto = callPackage ../games/xmoto { };
xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { };