lincity_ng: cleanups and compile against older physfs

This commit is contained in:
Peter Hoeg 2018-01-13 13:58:22 +08:00
parent 7177c9e336
commit 883957c0e6
2 changed files with 38 additions and 21 deletions

View file

@ -1,41 +1,55 @@
{stdenv, fetchgit
, zlib, jam, pkgconfig, gettext, libxml2, libxslt, xproto, libX11, mesa, SDL
, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, physfs, autoconf, automake, libtool
{ stdenv, fetchFromGitHub, autoreconfHook, jam, pkgconfig
, zlib, libxml2, libxslt, xproto, libX11, mesa, SDL
, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, physfs
}:
stdenv.mkDerivation rec {
name = "lincity-ng-${version}";
version = "2.9beta.20170715";
src = fetchgit {
url = "https://github.com/lincity-ng/lincity-ng";
rev = "0c19714b811225238f310633e59f428934185e6b";
src = fetchFromGitHub {
owner = "lincity-ng";
repo = "lincity-ng";
rev = "0c19714b811225238f310633e59f428934185e6b";
sha256 = "1gaj9fq97zmb0jsdw4rzrw34pimkmkwbfqps0glpqij4w3srz5f3";
};
hardeningDisable = [ "format" ];
nativeBuildInputs = [
jam autoconf automake libtool pkgconfig
autoreconfHook jam pkgconfig
];
buildInputs = [
zlib gettext libxml2 libxslt xproto libX11 mesa SDL SDL_mixer SDL_image
zlib libxml2 libxslt xproto libX11 mesa SDL SDL_mixer SDL_image
SDL_ttf SDL_gfx physfs
];
preConfigure = ''
./autogen.sh
'';
autoreconfPhase = ''
./autogen.sh
'';
installPhase = ''
touch CREDITS
AR='ar r' jam install
'';
buildPhase = ''
runHook preBuild
meta = {
description = ''City building game'';
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = [stdenv.lib.maintainers.raskin];
AR='ar r' jam -j $NIX_BUILD_CORES
runHook postBuild
'';
installPhase = ''
runHook preInstall
touch CREDITS
AR='ar r' jam install
runHook postInstall
'';
meta = with stdenv.lib; {
description = "City building game";
license = licenses.gpl2;
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
};
}

View file

@ -18231,7 +18231,10 @@ with pkgs;
lincity = callPackage ../games/lincity {};
lincity_ng = callPackage ../games/lincity/ng.nix {};
lincity_ng = callPackage ../games/lincity/ng.nix {
# https://github.com/lincity-ng/lincity-ng/issues/25
physfs = physfs_2;
};
liquidwar = callPackage ../games/liquidwar {
guile = guile_1_8;