From 3e21aaeb8e5597dec94591735d51e24e2cec6a48 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 14 Jul 2015 11:01:01 +0200 Subject: warmux: reimplement using mkDerivation --- pkgs/games/warmux/default.nix | 67 ++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 43 deletions(-) (limited to 'pkgs/games/warmux/default.nix') diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix index ad633d15a8c..7bf277a7f9e 100644 --- a/pkgs/games/warmux/default.nix +++ b/pkgs/games/warmux/default.nix @@ -1,55 +1,36 @@ -x@{builderDefsPackage - , zlib - , curl, gnutls, fribidi, libpng, SDL, SDL_gfx, SDL_image, SDL_mixer - , SDL_net, SDL_ttf, libunwind, libX11, xproto, libxml2, pkgconfig - , gettext, intltool, libtool, perl - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl +, zlib, curl, gnutls, fribidi, libpng, SDL, SDL_gfx, SDL_image, SDL_mixer +, SDL_net, SDL_ttf, libunwind, libX11, xproto, libxml2, pkgconfig +, gettext, intltool, libtool, perl +}: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="warmux"; - version="11.04.1"; - name="${baseName}-${version}"; - url="http://download.gna.org/${baseName}/${name}.tar.bz2"; - hash="1vp44wdpnb1g6cddmn3nphc543pxsdhjis52mfif0p2c7qslz73q"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; +stdenv.mkDerivation rec { + name = "warmux-${version}"; + version = "11.04.1"; - inherit (sourceInfo) name version; - inherit buildInputs; + src = fetchurl { + url = "http://download.gna.org/warmux/${name}.tar.bz2"; + sha256 = "1vp44wdpnb1g6cddmn3nphc543pxsdhjis52mfif0p2c7qslz73q"; + }; - /* doConfigure should be removed if not needed */ - phaseNames = ["doPatch" "doConfigure" "doMakeInstall"]; + buildInputs = + [ zlib curl gnutls fribidi libpng SDL SDL_gfx SDL_image SDL_mixer + SDL_net SDL_ttf libunwind libX11 xproto libxml2 pkgconfig + gettext intltool libtool perl + ]; - configureFlags = "CFLAGS=\"-include ${zlib}/include/zlib.h\""; + configureFlagsArray = ("CFLAGS=-include ${zlib}/include/zlib.h"); patches = [ ./gcc-fix.patch ]; - meta = { + meta = with stdenv.lib; { description = "Ballistics turn-based battle game between teams"; - maintainers = with a.lib.maintainers; + maintainers = with maintainers; [ raskin ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.gpl2; - }; - passthru = { - updateInfo = { - downloadPage = "http://download.gna.org/warmux/"; - }; + platforms = platforms.linux; + license = licenses.gpl2; + downloadPage = "http://download.gna.org/warmux/"; }; -}) x - +} -- cgit 1.4.1