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

Update ufoai to 2.4, clean dependencies and the expression.

This commit is contained in:
Vladimír Čunát 2013-01-22 14:56:01 +01:00
parent 9397f5b25f
commit 46dd0485f5
2 changed files with 19 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
pkgs/games/ufoai/default.nix
View File

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

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

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