diff options
| author | Robin Gloster <mail@glob.in> | 2016-01-17 16:55:24 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-01-17 16:55:24 +0100 |
| commit | 11468de4a10ba8c5b016381052d7aeee663eb92e (patch) | |
| tree | 2a8667576bde62d104009104acbe35a0f424c742 | |
| parent | a69192df2b074909e271b4c5132913266dbfdf88 (diff) | |
| parent | 5dbf70b92489387e4d86919139b64b9dab0c40e0 (diff) | |
| download | nixpkgs-11468de4a10ba8c5b016381052d7aeee663eb92e.tar nixpkgs-11468de4a10ba8c5b016381052d7aeee663eb92e.tar.gz nixpkgs-11468de4a10ba8c5b016381052d7aeee663eb92e.tar.bz2 nixpkgs-11468de4a10ba8c5b016381052d7aeee663eb92e.tar.lz nixpkgs-11468de4a10ba8c5b016381052d7aeee663eb92e.tar.xz nixpkgs-11468de4a10ba8c5b016381052d7aeee663eb92e.tar.zst nixpkgs-11468de4a10ba8c5b016381052d7aeee663eb92e.zip | |
Merge pull request #12421 from otwieracz/0ad_0.18_to_0.19
0ad: 0.18 -> 0.19
| -rw-r--r-- | pkgs/games/0ad/data.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/0ad/default.nix | 12 |
2 files changed, 8 insertions, 6 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..f9eb90f34f8 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 = '' @@ -84,7 +86,7 @@ stdenv.mkDerivation rec { installPhase = '' # Copy executables. mkdir -p "$out"/bin - cp binaries/system/pyrogenesis "$out"/bin/ + cp binaries/system/pyrogenesis "$out"/bin/0ad ((${ toString withEditor })) && cp binaries/system/ActorEditor "$out"/bin/ # Copy l10n data. |