Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

xmoto: refactor, remove patches and add myself to maintainers

+20 -46
+19 -25
pkgs/games/xmoto/default.nix
··· 1 - a : 2 - let 3 - s = import ./src-for-default.nix; 4 - buildInputs = with a; [ 1 + { stdenv, fetchurl, chipmunk, sqlite, curl, zlib, bzip2, libjpeg 2 + , libpng, freeglut, mesa, SDL, SDL_mixer, SDL_image, SDL_net 3 + , SDL_ttf, lua5, ode, libxdg_basedir, libxml2 }: 4 + 5 + stdenv.mkDerivation rec { 6 + name = "xmoto-${version}"; 7 + version = "0.5.11"; 8 + 9 + src = fetchurl { 10 + url = "http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz"; 11 + sha256 = "1ci6r8zd0l7z28cy92ddf9dmqbdqwinz2y1cny34c61b57wsd155"; 12 + }; 13 + 14 + buildInputs = [ 5 15 chipmunk sqlite curl zlib bzip2 libjpeg libpng 6 16 freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf 7 17 lua5 ode libxdg_basedir libxml2 8 18 ]; 9 - in 10 - rec { 11 - src = a.fetchUrlFromSrcInfo s; 12 19 13 - inherit (s) name; 14 - inherit buildInputs; 15 - configureFlags = []; 16 - 17 - /* doConfigure should be removed if not needed */ 18 - phaseNames = [ "patchIncludes" "doConfigure" "doMakeInstall"]; 19 - patchIncludes = a.fullDepEntry '' 20 - sed -e '1i#include <sys/types.h>' -i src/helpers//System.cpp 21 - sed -e '1i#include <unistd.h>' -i src/helpers//System.cpp 22 - '' ["doUnpack" "minInit"]; 23 - 24 - meta = { 25 - description = "X-Moto - obstacled race game"; 26 - maintainers = [ 27 - a.lib.maintainers.raskin 28 - a.lib.maintainers.viric 29 - ]; 30 - platforms = a.lib.platforms.linux; 20 + meta = with stdenv.lib; { 21 + description = "Obstacled race game"; 22 + homepage = http://xmoto.tuxfamily.org; 23 + maintainers = with maintainers; [ raskin viric pSub ]; 24 + platforms = platforms.linux; 31 25 }; 32 26 }
-9
pkgs/games/xmoto/src-for-default.nix
··· 1 - rec { 2 - version="0.5.11"; 3 - name="xmoto-0.5.11"; 4 - hash="1ci6r8zd0l7z28cy92ddf9dmqbdqwinz2y1cny34c61b57wsd155"; 5 - url="http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz"; 6 - advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.11/xmoto-0.5.11-src.tar.gz"; 7 - 8 - 9 - }
-7
pkgs/games/xmoto/src-info-for-default.nix
··· 1 - { 2 - downloadPage = "http://xmoto.tuxfamily.org/"; 3 - baseName = "xmoto"; 4 - sourceRegexp = "xmoto-.*-src[.]tar[.].*"; 5 - versionExtractorSedScript = ''$dashDelimitedVersion''; 6 - versionReferenceCreator=''$(replaceAllVersionOccurences)''; 7 - }
+1 -5
pkgs/top-level/all-packages.nix
··· 9851 9851 9852 9852 xf86_video_nouveau = xorg.xf86videonouveau; 9853 9853 9854 - xmoto = builderDefsPackage (import ../games/xmoto) { 9855 - inherit chipmunk sqlite curl zlib bzip2 libjpeg libpng 9856 - freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf 9857 - lua5 ode libxdg_basedir libxml2; 9858 - }; 9854 + xmoto = callPackage ../games/xmoto { }; 9859 9855 9860 9856 xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { }; 9861 9857