diff options
| author | Sou Bunnbu <iyzsong@gmail.com> | 2015-02-03 19:22:44 +0800 |
|---|---|---|
| committer | Sou Bunnbu <iyzsong@gmail.com> | 2015-02-03 19:22:44 +0800 |
| commit | e91dd46ba452bf3b5285181dc1da8eac41caac9d (patch) | |
| tree | f284bd4267565db6a77240f45e3a0b0a1ac83fb1 /pkgs/games | |
| parent | b7ecd5e72920bafcb79d759d925fd120cece6558 (diff) | |
| parent | 5b03e5d02ecbc237db38182c0c14120db3c424ac (diff) | |
| download | nixpkgs-e91dd46ba452bf3b5285181dc1da8eac41caac9d.tar nixpkgs-e91dd46ba452bf3b5285181dc1da8eac41caac9d.tar.gz nixpkgs-e91dd46ba452bf3b5285181dc1da8eac41caac9d.tar.bz2 nixpkgs-e91dd46ba452bf3b5285181dc1da8eac41caac9d.tar.lz nixpkgs-e91dd46ba452bf3b5285181dc1da8eac41caac9d.tar.xz nixpkgs-e91dd46ba452bf3b5285181dc1da8eac41caac9d.tar.zst nixpkgs-e91dd46ba452bf3b5285181dc1da8eac41caac9d.zip | |
Merge pull request #6097 from waylon531/patch-1
Update 0ad 0.0.16 -> 0.0.17
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/0ad/data.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/0ad/default.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix index 6f3c85183da..d3cc13307e7 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 = "0f16d41e81d7349fb16490f3abbfd38bcb3f2b89648355b2b281c5045ddafadc"; + sha256 = "6bf2234ef5043b14a3bbeda013fefed73ce2e564262f5e03b0801bfe671331d0"; }; patchPhase = '' diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix index 78b76f1ac36..9698818c557 100644 --- a/pkgs/games/0ad/default.nix +++ b/pkgs/games/0ad/default.nix @@ -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; }; } |