Merge branch 'master' into staging

3 files changed, 36 insertions, 23 deletions

diff --git a/pkgs/games/enyo-doom/default.nix b/pkgs/games/enyo-doom/default.nix
index 573190ab8257..742ca9591357 100644
--- a/pkgs/games/enyo-doom/default.nix
+++ b/pkgs/games/enyo-doom/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "enyo-doom-${version}";
-  version = "1.06";
+  version = "1.06.9";
 
   src = fetchFromGitLab {
     owner = "sdcofer70";
     repo = "enyo-doom";
     rev = version;
-    sha256 = "17f9qq8gnim6glqlrg7189my4d5y40v76cbpaqgpvrhpyc7z9vf6";
+    sha256 = "0vx5zy47cqrqdgyx31wg56ivva0qqiyww8bp1x32ax99danymjyf";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix
index 5d7883c18949..9fc260e74062 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@@ -1,6 +1,8 @@
-{ stdenv, fetchurl, zlib, bzip2, pkgconfig, curl, lzma, gettext, libiconv
+{ stdenv, fetchFromGitHub, autoreconfHook, lua5_3, pkgconfig, python
+, zlib, bzip2, curl, lzma, gettext, libiconv
 , sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth
-, gtkClient ? false, gtk2
+, gtkClient ? false, gtk3
+, qtClient ? false, qt5
 , server ? true, readline
 , enableSqlite ? true, sqlite
 }:
@@ -8,31 +10,42 @@
 let
   inherit (stdenv.lib) optional optionals;
 
-  name = "freeciv";
+in stdenv.mkDerivation rec {
+  pname = "freeciv";
   version = "2.6.0";
-in
-stdenv.mkDerivation {
-  name = "${name}-${version}";
-  inherit version;
-
-  src = fetchurl {
-    url = "mirror://sourceforge/freeciv/${name}-${version}.tar.bz2";
-    sha256 = "16f9wsnn7073s6chzbm3819swd0iw019p9nrzr3diiynk28kj83w";
+
+  src = fetchFromGitHub {
+    owner = "freeciv";
+    repo = "freeciv";
+    rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}";
+    sha256 = "1b3q5k9wpv7z24svz01ybw8d8wlzkkdr6ia5hgp6cxk6vq67n67s";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  postPatch = ''
+    for f in {common,utility}/*.py; do
+      substituteInPlace $f \
+        --replace '/usr/bin/env python' ${python.interpreter}
+    done
+  '';
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
-  buildInputs = [ zlib bzip2 curl lzma gettext libiconv ]
+  buildInputs = [ lua5_3 zlib bzip2 curl lzma gettext libiconv ]
     ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ]
-    ++ optionals gtkClient [ gtk2 ]
+    ++ optionals gtkClient [ gtk3 ]
+    ++ optionals qtClient  [ qt5.qtbase ]
     ++ optional server readline
     ++ optional enableSqlite sqlite;
 
   configureFlags = [ "--enable-shared" ]
     ++ optional sdlClient "--enable-client=sdl"
+    ++ optionals qtClient [
+      "--enable-client=qt"
+      "--with-qt5-includes=${qt5.qtbase.dev}/include"
+    ]
     ++ optional enableSqlite "--enable-fcdb=sqlite3"
     ++ optional (!gtkClient) "--enable-fcmp=cli"
-    ++ optional (!server) "--disable-server";
+    ++ optional (!server)    "--disable-server";
 
   enableParallelBuilding = true;
 
@@ -46,11 +59,11 @@ stdenv.mkDerivation {
       to the space age...
     '';
 
-    homepage = http://freeciv.wikia.com/;
+    homepage = http://www.freeciv.org; # http only
     license = licenses.gpl2;
 
     maintainers = with maintainers; [ pierron ];
     platforms = platforms.unix;
-    hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin
+    hydraPlatforms = platforms.linux; # sdl-config times out on darwin
   };
 }
diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix
index 673efb0e118d..dab83ddc900d 100644
--- a/pkgs/games/mudlet/default.nix
+++ b/pkgs/games/mudlet/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, unzip, stdenv, makeWrapper, qtbase, yajl, libzip, hunspell
-, boost, lua5_1, luafilesystem, luazip, lrexlib, luasqlite3, qmake }:
+, boost, lua5_1, luafilesystem, luazip, lrexlib-pcre, luasql-sqlite3, qmake }:
 
 stdenv.mkDerivation rec {
   name = "mudlet-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper qmake ];
   buildInputs = [
     unzip qtbase lua5_1 hunspell libzip yajl boost
-    luafilesystem luazip lrexlib luasqlite3
+    luafilesystem luazip lrexlib-pcre luasql-sqlite3
   ];
 
   preConfigure = "cd src";
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
   installPhase = let
     luaZipPath = "${luazip}/lib/lua/5.1/?.so";
     luaFileSystemPath = "${luafilesystem}/lib/lua/5.1/?.so";
-    lrexlibPath = "${lrexlib}/lib/lua/5.1/?.so";
-    luasqlitePath = "${luasqlite3}/lib/lua/5.1/?.so";
+    lrexlibPath = "${lrexlib-pcre}/lib/lua/5.1/?.so";
+    luasqlitePath = "${luasql-sqlite3}/lib/lua/5.1/?.so";
   in ''
     mkdir -pv $out/bin
     cp mudlet $out