diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index 602daa1ee864..ce346459201d 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"; - }; + # To avoid problems finding SDL_types.h. + configureFlags = [ "CFLAGS=-I${SDL}/include/SDL" ]; - inherit buildInputs; - configureFlags = []; - - /* doConfigure should be removed if not needed */ - phaseNames = ["setVars" "doConfigure" "doMakeInstall"]; - - setVars = a.noDepEntry ('' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.SDL}/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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8ceb32a499d..5b90ab3e8b2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14139,7 +14139,7 @@ let lincity_ng = callPackage ../games/lincity/ng.nix {}; - liquidwar = builderDefsPackage (callPackage ../games/liquidwar) { + liquidwar = callPackage ../games/liquidwar { guile = guile_1_8; };