Update ufoai to 2.4, clean dependencies and the expression.

pkgs/games/ufoai/default.nix

@@ -1,53 +1,35 @@
-{stdenv, fetchurl, SDL, mesa, SDL_image, SDL_ttf, SDL_mixer, libpng, libjpeg, zlib
-, curl, libvorbis, libtheora, xvidcore, pkgconfig, gtk, glib, libxml2, gtksourceview
-, gtkglext, openal, gettext, p7zip }:
+{ stdenv, fetchurl, libtheora, xvidcore, mesa, SDL, SDL_ttf, SDL_mixer
+, curl, libjpeg, libpng, gettext, cunit, enableEditor?false }:
 
 stdenv.mkDerivation rec {
-  name = "ufoai-2.3";
+  name = "ufoai-2.4";
   src = fetchurl {
-    url = mirror://sourceforge/ufoai/ufoai-2.3-source.tar.bz2;
-    sha256 = "1pb41q5wx180l6xv8gm1sw8b7cji42znnb6qpjaap6vpgc8k3hp9";
+    url = "mirror://sourceforge/ufoai/${name}-source.tar.bz2";
+    sha256 = "0kxrbcjrharcwz319s90m789i4my9285ihp5ax6kfhgif2vn2ji5";
   };
 
   srcData = fetchurl {
-    url = mirror://sourceforge/ufoai/ufoai-2.3-data.tar;
-    sha256 = "0952kx6cbi4y89fbz1ig32rvsmfhzqpvdf79rq4axag9d3i5qlqf";
+    url = "mirror://sourceforge/ufoai/${name}-data.tar";
+    sha256 = "1drhh08cqqkwv1yz3z4ngkplr23pqqrdx6cp8c3isy320gy25cvb";
   };
 
-  srcI18n = fetchurl {
-    url = mirror://sourceforge/ufoai/ufoai-2.3-i18n.tar.bz2;
-    sha256 = "14fzv8a4xng6kfl6aw8yzz6vl2j5vryxija5b2yz75jbfpa94i09";
-  };
+  preConfigure = ''tar xvf "${srcData}"'';
 
-  # for the xvidcore static lib
-  NIX_CFLAGS_COMPILE = "-pthread -lm";
+  configureFlags = [ "--enable-release" "--enable-sse" ]
+    ++ stdenv.lib.optional enableEditor "--enable-uforadiant";
 
-  # Order is important, x libs include a libpng version that fails for ufoai
-  buildInputs = [ libpng SDL mesa SDL_image SDL_ttf SDL_mixer libjpeg zlib curl libvorbis
-    libtheora xvidcore pkgconfig glib gtk gtkglext gtksourceview libxml2 openal gettext
-    p7zip ];
+  buildInputs = [
+    libtheora xvidcore mesa SDL SDL_ttf SDL_mixer
+    curl libjpeg libpng gettext cunit
+  ];
 
-  enableParallelBuilding = true;
-
-  preConfigure = ''
-    tar xvf $srcI18n
-  '';
-
-  configureFlags = "--enable-release";
-
-  postInstall = ''
-    pushd $out/share/ufoai
-    tar xvf $srcData
-    popd
-  '';
-
-  installTargets = "install_exec";
+  NIX_CFLAGS_LINK = "-lgcc_s"; # to avoid occasional runtime error in finding libgcc_s.so.1
 
   meta = {
-    homepage = http://www.ultimatestunts.nl/;
-    description = "Squad-based tactical strategy game in the tradition of X-Com";
+    homepage = http://ufoai.org;
+    description = "A squad-based tactical strategy game in the tradition of X-Com";
     license = "GPLv2+";
     maintainers = with stdenv.lib.maintainers; [viric];
-    #platforms = stdenv.lib.platforms.linux;
+    platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/top-level/all-packages.nix

@@ -8411,10 +8411,7 @@ let
 
   trigger = callPackage ../games/trigger { };
 
-  ufoai = callPackage ../games/ufoai {
-    inherit (gnome) gtksourceview gtkglext;
-    libpng = libpng12;
-  };
+  ufoai = callPackage ../games/ufoai { };
 
   ultimatestunts = callPackage ../games/ultimatestunts { };