Skip to content

Commit

Permalink
Merge pull request NixOS#89242 from foxit64/yquake2-743
Browse files Browse the repository at this point in the history
yquake2: 7.30 -> 7.43
  • Loading branch information
Lassulus committed Jun 2, 2020
2 parents f537528 + 7864354 commit 5e1bdc6
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions pkgs/games/quake2/yquake2/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, buildEnv, cmake, makeWrapper
, SDL2, libGL
, SDL2, libGL, curl
, oggSupport ? true, libogg, libvorbis
, openalSupport ? true, openal
, zipSupport ? true, zlib
Expand All @@ -15,20 +15,20 @@ let

yquake2 = stdenv.mkDerivation rec {
pname = "yquake2";
version = "7.30";
version = "7.43";

src = fetchFromGitHub {
owner = "yquake2";
repo = "yquake2";
rev = "QUAKE2_${builtins.replaceStrings ["."] ["_"] version}";
sha256 = "0xfr620k1hns70dckv6k0kc72jbiwyghcys904jpriv5x94lnrlc";
sha256 = "1dszbvxlh1npq4nv9s4wv4lcyfgb01k92ncxrrczsxy1dddg86pp";
};

enableParallelBuilding = true;

nativeBuildInputs = [ cmake ];

buildInputs = [ SDL2 libGL ]
buildInputs = [ SDL2 libGL curl ]
++ lib.optionals stdenv.isDarwin [ Cocoa OpenAL ]
++ lib.optionals oggSupport [ libogg libvorbis ]
++ lib.optional openalSupport openal
Expand Down
12 changes: 6 additions & 6 deletions pkgs/games/quake2/yquake2/games.nix
Expand Up @@ -4,23 +4,23 @@ let
games = {
ctf = {
id = "ctf";
version = "1.05";
version = "1.07";
description = "'Capture The Flag' for Yamagi Quake II";
sha256 = "15ihspyshls645ig0gq6bwdzvghyyysqk60g6ad3n4idb2ms52md";
sha256 = "0i9bwhjvq6yhalrsbzjambh27fdzrzgswqz3jgfn9qw6k1kjvlin";
};

ground-zero = {
id = "rogue";
version = "2.04";
version = "2.07";
description = "'Ground Zero' for Yamagi Quake II";
sha256 = "0x1maaycrxv7d3xvvk1ih2zymhvcd3jnab7g3by8qh6g5y33is5l";
sha256 = "1m2r4vgfdxpsi0lkf32liwf1433mdhhmjxiicjwzqjlkncjyfcb1";
};

the-reckoning = {
id = "xatrix";
version = "2.05";
version = "2.08";
description = "'The Reckoning' for Yamagi Quake II";
sha256 = "0gf2ryhgz8nw1mb1arlbriihjsx09fa0wmkgcayc8ijignfi1qkh";
sha256 = "1wp9fg1q8nly2r9hh4394r1h4dxyni3lvdy7g419cz5s8hhn5msr";
};
};

Expand Down

0 comments on commit 5e1bdc6

Please sign in to comment.