Merge pull request #6097 from waylon531/patch-1

Update 0ad 0.0.16 -> 0.0.17
This commit is contained in:
Sou Bunnbu 2015-02-03 19:22:44 +08:00
commit e91dd46ba4
2 changed files with 4 additions and 4 deletions

View file

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-data.tar.xz";
sha256 = "0f16d41e81d7349fb16490f3abbfd38bcb3f2b89648355b2b281c5045ddafadc";
sha256 = "6bf2234ef5043b14a3bbeda013fefed73ce2e564262f5e03b0801bfe671331d0";
};
patchPhase = ''

View file

@ -9,7 +9,7 @@
assert withEditor -> wxGTK != null;
let
version = "0.0.16";
version = "0.0.17";
releaseType = "alpha";
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-build.tar.xz";
sha256 = "cb965ef7e292bc3a2f1f598a9695e16ff4d786398f384a1ec7d5f9bfe2626de5";
sha256 = "ef144d44fe8a8abd29a4642999a58a596b8f0d0e1f310065f5ce1dfbe29c3aeb";
};
buildInputs = [
@ -64,6 +64,7 @@ stdenv.mkDerivation rec {
--bindir="$out"/bin \
--libdir="$out"/lib/0ad \
--datadir="$out"/share/0ad \
--without-tests \
gmake
popd
'';
@ -116,6 +117,5 @@ stdenv.mkDerivation rec {
homepage = "http://wildfiregames.com/0ad/";
license = [ "GPLv2" "LGPLv2.1" "MIT" "CC BY-SA 3.0" "zlib" ];
platforms = [ "x86_64-linux" "i686-linux" ];
broken = true;
};
}