diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-11-11 01:32:22 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-11-21 02:46:35 +0300 |
| commit | 292bb8f4c3048b38b3a7e1804db6ecd433ffbc21 (patch) | |
| tree | d6cf9af7f38b0d4e4b562efbb49d907613b31bcd /pkgs/games/0ad | |
| parent | bc5b9a3fa46b9098610b466a29402bc2e35a5912 (diff) | |
zeroad: 0.0.20 -> 0.0.21
Diffstat (limited to 'pkgs/games/0ad')
| -rw-r--r-- | pkgs/games/0ad/data.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/0ad/game.nix | 15 |
2 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix index 6b4dface0e1c..68ef1fd53926 100644 --- a/pkgs/games/0ad/data.nix +++ b/pkgs/games/0ad/data.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "0ad-data-${version}"; - version = "0.0.20"; + version = "0.0.21"; src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"; - sha256 = "1lzl8chfqbgs1n9vpn0xaqd70kpwiibfk196iblyq6qkms3v6pnv"; + sha256 = "15xadyrpvq27lm9p1ny7bcmmv56m16h3xadbkdx69gfkzxc3razk"; }; installPhase = '' diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index e4d4e3cb8e4e..f038673f4c0b 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -1,5 +1,5 @@ { stdenv, lib, callPackage, perl, fetchurl, python2 -, pkgconfig, spidermonkey_31, boost, icu, libxml2, libpng +, pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc , openal, mesa, xproto, libX11, libXcursor, nspr, SDL, SDL2 , gloox, nvidia-texture-tools @@ -10,17 +10,17 @@ assert withEditor -> wxGTK != null; stdenv.mkDerivation rec { name = "0ad-${version}"; - version = "0.0.20"; + version = "0.0.21"; src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz"; - sha256 = "13n61xhjsawda3kl7112la41bqkbqmq4yhr3slydsz856z5xb5m3"; + sha256 = "1kw3hqnr737ipx4f03khz3hvsh3ha7r8iy9njppk2faa53j27gln"; }; nativeBuildInputs = [ python2 perl pkgconfig ]; buildInputs = [ - spidermonkey_31 boost icu libxml2 libpng libjpeg + spidermonkey_38 boost icu libxml2 libpng libjpeg zlib curl libogg libvorbis enet miniupnpc openal mesa xproto libX11 libXcursor nspr SDL2 gloox nvidia-texture-tools @@ -44,11 +44,16 @@ stdenv.mkDerivation rec { # Delete shipped libraries which we don't need. rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey} + # Workaround invalid pkgconfig name for mozjs + mkdir pkgconfig + ln -s ${spidermonkey_38}/lib/pkgconfig/* pkgconfig/mozjs-38.pc + PKG_CONFIG_PATH="$PWD/pkgconfig:$PKG_CONFIG_PATH" + # Update Makefiles pushd build/workspaces ./update-workspaces.sh \ --with-system-nvtt \ - --with-system-mozjs31 \ + --with-system-mozjs38 \ ${lib.optionalString withEditor "--enable-atlas"} \ --bindir="$out"/bin \ --libdir="$out"/lib/0ad \ |