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

0ad: 0.18 -> 0.19

This commit is contained in:
Slawomir Gonet 2016-01-16 15:08:19 +01:00
parent 06d49bfba7
commit 1e0434ebe0
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/games/0ad/data.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-data.tar.xz"; url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-data.tar.xz";
sha256 = "0i5cf4n9qhzbi6hvw5lxapind24qpqfq6p5lrhx8gb25p670g95i"; sha256 = "0f406ynz2fbg3hwavh52xh4f7kqm4mzhz59kkvb6dpsax5agalwk";
}; };
patchPhase = '' patchPhase = ''

10
pkgs/games/0ad/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, callPackage, fetchurl, python27 { stdenv, callPackage, fetchurl, python27
, pkgconfig, spidermonkey_31, boost, icu, libxml2, libpng , pkgconfig, spidermonkey_31, boost, icu, libxml2, libpng
, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
, openal, mesa, xproto, libX11, libXcursor, nspr, SDL , openal, mesa, xproto, libX11, libXcursor, nspr, SDL, SDL2
, gloox, nvidia-texture-tools , gloox, nvidia-texture-tools
, withEditor ? true, wxGTK ? null , withEditor ? true, wxGTK ? null
}: }:
@ -9,7 +9,7 @@
assert withEditor -> wxGTK != null; assert withEditor -> wxGTK != null;
let let
version = "0.0.18"; version = "0.0.19";
releaseType = "alpha"; releaseType = "alpha";
@ -25,20 +25,22 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-build.tar.xz"; url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-build.tar.xz";
sha256 = "15q3mv5k3lqzf0wrby2r93fs194ym13790i68q8azscs4v9h8bxx"; sha256 = "1cwvhg30i6axm7y5b62qyjwf1j8gwa5fgc13xsga3gzdphmjchrd";
}; };
buildInputs = [ buildInputs = [
zeroadData python27 pkgconfig spidermonkey_31 boost icu zeroadData python27 pkgconfig spidermonkey_31 boost icu
libxml2 libpng libjpeg zlib curl libogg libvorbis enet libxml2 libpng libjpeg zlib curl libogg libvorbis enet
miniupnpc openal mesa xproto libX11 libXcursor nspr miniupnpc openal mesa xproto libX11 libXcursor nspr
SDL gloox nvidia-texture-tools SDL SDL2 gloox nvidia-texture-tools
] ++ stdenv.lib.optional withEditor wxGTK; ] ++ stdenv.lib.optional withEditor wxGTK;
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE = [
"-I${xproto}/include/X11" "-I${xproto}/include/X11"
"-I${libX11}/include/X11" "-I${libX11}/include/X11"
"-I${libXcursor}/include/X11" "-I${libXcursor}/include/X11"
"-I${SDL}/include/SDL"
"-I${SDL2}/include/SDL2"
]; ];
patchPhase = '' patchPhase = ''