b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

0ad: Alpha 17 -> Alpha 18

Browse source
This commit is contained in:
Anders Papitto 2015-08-28 14:34:22 -07:00
parent 4bcde3f244
commit 3455919cd0
2 changed files with 10 additions and 6 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 {
url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-data.tar.xz";
sha256 = "6bf2234ef5043b14a3bbeda013fefed73ce2e564262f5e03b0801bfe671331d0";
sha256 = "0i5cf4n9qhzbi6hvw5lxapind24qpqfq6p5lrhx8gb25p670g95i";
};
patchPhase = ''

14
pkgs/games/0ad/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, callPackage, fetchurl, python27
, pkgconfig, spidermonkey_24, boost, icu, libxml2, libpng
, pkgconfig, spidermonkey_31, boost, icu, libxml2, libpng
, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
, openal, mesa, xproto, libX11, libXcursor, nspr, SDL
, gloox, nvidia-texture-tools
@ -9,7 +9,7 @@
assert withEditor -> wxGTK != null;
let
version = "0.0.17";
version = "0.0.18";
releaseType = "alpha";
@ -25,11 +25,11 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-build.tar.xz";
sha256 = "ef144d44fe8a8abd29a4642999a58a596b8f0d0e1f310065f5ce1dfbe29c3aeb";
sha256 = "15q3mv5k3lqzf0wrby2r93fs194ym13790i68q8azscs4v9h8bxx";
};
buildInputs = [
zeroadData python27 pkgconfig spidermonkey_24 boost icu
zeroadData python27 pkgconfig spidermonkey_31 boost icu
libxml2 libpng libjpeg zlib curl libogg libvorbis enet
miniupnpc openal mesa xproto libX11 libXcursor nspr
SDL gloox nvidia-texture-tools
@ -41,6 +41,10 @@ stdenv.mkDerivation rec {
"-I${libXcursor}/include/X11"
];
patchPhase = ''
sed -i 's/MOZJS_MINOR_VERSION/false \&\& MOZJS_MINOR_VERSION/' source/scriptinterface/ScriptTypes.h
'';
configurePhase = ''
# Delete shipped libraries which we don't need.
rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey}
@ -58,7 +62,7 @@ stdenv.mkDerivation rec {
--with-system-nvtt \
--with-system-enet \
--with-system-miniupnpc \
--with-system-mozjs24 \
--with-system-mozjs31 \
${ if withEditor then "--atlas" else "" } \
--collada \
--bindir="$out"/bin \