diff options
| author | Slawomir Gonet <slawek@otwiera.cz> | 2016-01-16 15:08:19 +0100 |
|---|---|---|
| committer | Slawomir Gonet <slawek@otwiera.cz> | 2016-01-16 15:09:47 +0100 |
| commit | 1e0434ebe0cf438cbe0230769ea18e324ccf35d8 (patch) | |
| tree | 93ffd56b52a4e5d75a325ac0f2005769fce32e37 /pkgs/games | |
| parent | 06d49bfba714d53417f34d61bc7b6fc086671407 (diff) | |
| download | nixpkgs-1e0434ebe0cf438cbe0230769ea18e324ccf35d8.tar nixpkgs-1e0434ebe0cf438cbe0230769ea18e324ccf35d8.tar.gz nixpkgs-1e0434ebe0cf438cbe0230769ea18e324ccf35d8.tar.bz2 nixpkgs-1e0434ebe0cf438cbe0230769ea18e324ccf35d8.tar.lz nixpkgs-1e0434ebe0cf438cbe0230769ea18e324ccf35d8.tar.xz nixpkgs-1e0434ebe0cf438cbe0230769ea18e324ccf35d8.tar.zst nixpkgs-1e0434ebe0cf438cbe0230769ea18e324ccf35d8.zip | |
0ad: 0.18 -> 0.19
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/0ad/data.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/0ad/default.nix | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix index ea9951e3339..f2f5a9e9b21 100644 --- a/pkgs/games/0ad/data.nix +++ b/pkgs/games/0ad/data.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-data.tar.xz"; - sha256 = "0i5cf4n9qhzbi6hvw5lxapind24qpqfq6p5lrhx8gb25p670g95i"; + sha256 = "0f406ynz2fbg3hwavh52xh4f7kqm4mzhz59kkvb6dpsax5agalwk"; }; patchPhase = '' diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix index 7ffa44c1fe4..e2897c5253c 100644 --- a/pkgs/games/0ad/default.nix +++ b/pkgs/games/0ad/default.nix @@ -1,7 +1,7 @@ { stdenv, callPackage, fetchurl, python27 , pkgconfig, spidermonkey_31, boost, icu, libxml2, libpng , 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 , withEditor ? true, wxGTK ? null }: @@ -9,7 +9,7 @@ assert withEditor -> wxGTK != null; let - version = "0.0.18"; + version = "0.0.19"; releaseType = "alpha"; @@ -25,20 +25,22 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-build.tar.xz"; - sha256 = "15q3mv5k3lqzf0wrby2r93fs194ym13790i68q8azscs4v9h8bxx"; + sha256 = "1cwvhg30i6axm7y5b62qyjwf1j8gwa5fgc13xsga3gzdphmjchrd"; }; buildInputs = [ 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 + SDL SDL2 gloox nvidia-texture-tools ] ++ stdenv.lib.optional withEditor wxGTK; NIX_CFLAGS_COMPILE = [ "-I${xproto}/include/X11" "-I${libX11}/include/X11" "-I${libXcursor}/include/X11" + "-I${SDL}/include/SDL" + "-I${SDL2}/include/SDL2" ]; patchPhase = '' |