From 883957c0e6a1241108ed5c1eea5461ba1d18a27e Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 13 Jan 2018 13:58:22 +0800
Subject: [PATCH] lincity_ng: cleanups and compile against older physfs

---
 pkgs/games/lincity/ng.nix       | 54 +++++++++++++++++++++------------
 pkgs/top-level/all-packages.nix |  5 ++-
 2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix
index 28fd6fe6e50..8004aa9931d 100644
--- a/pkgs/games/lincity/ng.nix
+++ b/pkgs/games/lincity/ng.nix
@@ -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;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 62af469d59b..509e2d4bf81 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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;