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

lincity_ng: cleanups and compile against older physfs

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pkgs/games/lincity/ng.nix
View File

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

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

@ -18231,7 +18231,10 @@ with pkgs;
lincity = callPackage ../games/lincity {}; 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 { liquidwar = callPackage ../games/liquidwar {
guile = guile_1_8; guile = guile_1_8;