nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 23:22:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

zeroad: 0.0.20 -> 0.0.21

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-11-11 01:32:22 +03:00
parent bc5b9a3fa4
commit 292bb8f4c3
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 = ''

15
pkgs/games/0ad/game.nix
View File

@ -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 \