diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-12-31 09:47:26 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-12-31 09:53:02 +0100 |
commit | f9f6f41bff2213e199bded515e9b66d1e5c4d7dd (patch) | |
tree | 29c5a75228e31f305f42c5b761709a186e406776 /pkgs/games/liquidwar | |
parent | bbcf127c7c9029cba43493d7d25a9d1c65d59152 (diff) | |
parent | 468f698f609e123bb0ffae67181d07ac99eb2204 (diff) |
Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5 on master, and I'm deferring pointing to correct outputs to later.
Diffstat (limited to 'pkgs/games/liquidwar')
-rw-r--r-- | pkgs/games/liquidwar/default.nix | 52 |
1 files changed, 21 insertions, 31 deletions
diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index a87c4dea0c374..f97c0ec412fc4 100644 --- a/pkgs/games/liquidwar/default.nix +++ b/pkgs/games/liquidwar/default.nix @@ -1,11 +1,20 @@ -a @ { xproto, libX11, libXrender +{ stdenv, fetchurl, xproto, libX11, libXrender , gmp, mesa, libjpeg, libpng -, expat, gettext, perl +, expat, gettext, perl, guile , SDL, SDL_image, SDL_mixer, SDL_ttf , curl, sqlite -, libogg, libvorbis, libcaca, csound, cunit, ... } : -let - buildInputs = with a; [ +, libogg, libvorbis, libcaca, csound, cunit } : + +stdenv.mkDerivation rec { + name = "liquidwar6-${version}"; + version = "0.6.3902"; + + src = fetchurl { + url = "mirror://gnu/liquidwar6/${name}.tar.gz"; + sha256 = "1976nnl83d8wspjhb5d5ivdvdxgb8lp34wp54jal60z4zad581fn"; + }; + + buildInputs = [ xproto libX11 gmp guile mesa libjpeg libpng expat gettext perl @@ -14,34 +23,15 @@ let libogg libvorbis csound libXrender libcaca cunit ]; -in -rec { - name = "liquidwar6-${meta.version}"; - src = a.fetchurl { - url = "mirror://gnu/liquidwar6/${name}.tar.gz"; - sha256 = "1976nnl83d8wspjhb5d5ivdvdxgb8lp34wp54jal60z4zad581fn"; - }; - - inherit buildInputs; - configureFlags = []; + # To avoid problems finding SDL_types.h. + configureFlags = [ "CFLAGS=-I${SDL.dev}/include/SDL" ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["setVars" "doConfigure" "doMakeInstall"]; - - setVars = a.noDepEntry ('' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.SDL.dev}/include/SDL" - ''); - - meta = { + meta = with stdenv.lib; { description = "Quick tactics game"; - maintainers = [ - a.lib.maintainers.raskin - ]; - platforms = with a.lib.platforms; - linux; - homepage = "http://www.gnu.org/software/liquidwar6/"; - version = "0.6.3902"; - updateWalker=true; + homepage = "http://www.gnu.org/software/liquidwar6/"; + maintainers = [ maintainers.raskin ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; }; } |