public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

liquidwar: use stdenv

Browse Source 
This replaces use of builderDefsPackage (#4210).
This commit is contained in:
Robert Helgesson 2015-12-29 13:55:54 +01:00
parent 2c9369dc43
commit 281b584e4a
2 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
pkgs/games/liquidwar/default.nix
View File

@ -1,11 +1,20 @@
a @ { xproto, libX11, libXrender { stdenv, fetchurl, xproto, libX11, libXrender
, gmp, mesa, libjpeg, libpng , gmp, mesa, libjpeg, libpng
, expat, gettext, perl , expat, gettext, perl, guile
, SDL, SDL_image, SDL_mixer, SDL_ttf , SDL, SDL_image, SDL_mixer, SDL_ttf
, curl, sqlite , curl, sqlite
, libogg, libvorbis, libcaca, csound, cunit, ... } : , libogg, libvorbis, libcaca, csound, cunit } :
let
buildInputs = with a; [ 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 xproto libX11 gmp guile
mesa libjpeg libpng mesa libjpeg libpng
expat gettext perl expat gettext perl
@ -14,34 +23,15 @@ let
libogg libvorbis csound libogg libvorbis csound
libXrender libcaca cunit libXrender libcaca cunit
]; ];
in
rec {
name = "liquidwar6-${meta.version}";
src = a.fetchurl { # To avoid problems finding SDL_types.h.
url = "mirror://gnu/liquidwar6/${name}.tar.gz"; configureFlags = [ "CFLAGS=-I${SDL}/include/SDL" ];
sha256 = "1976nnl83d8wspjhb5d5ivdvdxgb8lp34wp54jal60z4zad581fn";
};
inherit buildInputs; meta = with stdenv.lib; {
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 = {
description = "Quick tactics game"; description = "Quick tactics game";
maintainers = [ homepage = "http://www.gnu.org/software/liquidwar6/";
a.lib.maintainers.raskin maintainers = [ maintainers.raskin ];
]; license = licenses.gpl3Plus;
platforms = with a.lib.platforms; platforms = platforms.linux;
linux;
homepage = "http://www.gnu.org/software/liquidwar6/";
version = "0.6.3902";
updateWalker=true;
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -14139,7 +14139,7 @@ let
lincity_ng = callPackage ../games/lincity/ng.nix {}; lincity_ng = callPackage ../games/lincity/ng.nix {};
liquidwar = builderDefsPackage (callPackage ../games/liquidwar) { liquidwar = callPackage ../games/liquidwar {
guile = guile_1_8; guile = guile_1_8;
}; };