freeciv: 2.4.0 -> 2.5.0

1 files changed, 12 insertions, 6 deletions

diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix
index ac1fc7395ae..9c7b41abd87 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@@ -1,32 +1,38 @@
 { stdenv, fetchurl, zlib, bzip2, pkgconfig, curl, lzma, gettext
-, sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype
+, sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth
 , gtkClient ? false, gtk
 , server ? true, readline }:
 
 let
   inherit (stdenv.lib) optional optionals;
-  client = sdlClient || gtkClient;
 
   sdlName = if sdlClient then "-sdl" else "";
   gtkName = if gtkClient then "-gtk" else "";
 
-  baseName = "freeciv-2.4.0";
+  baseName = "freeciv-2.5.0";
 in
 stdenv.mkDerivation {
   name = baseName + sdlName + gtkName;
 
   src = fetchurl {
     url = "mirror://sourceforge/freeciv/${baseName}.tar.bz2";
-    sha256 = "1bc01pyihsrby6w95n49gi90ggp40dyxsy4kmlmwcakxfxprwakv";
+    sha256 = "bd9f7523ea79b8d2806d0c1844a9f48506ccd18276330580319913c43051210b";
+    # sha1 = "477b60e02606e47b31a019b065353c1a6da6c305";
+    # md5 = "8a61ecd986853200326711446c573f1b";
   };
 
   nativeBuildInputs = [ pkgconfig ];
 
   buildInputs = [ zlib bzip2 curl lzma gettext ]
-    ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype ]
-    ++ optional gtkClient gtk
+    ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ]
+    ++ optionals gtkClient [ gtk ]
     ++ optional server readline;
 
+  configureFlags = []
+    ++ optional sdlClient "--enable-client=sdl"
+    ++ optional (!gtkClient) "--enable-fcmp=cli"
+    ++ optional (!server) "--disable-server";
+
   meta = with stdenv.lib; {
     description = "Multiplayer (or single player), turn-based strategy game";