Skip to content

Commit

Permalink
ioquake3: 1.36 -> 20151228
Browse files Browse the repository at this point in the history
Renamed from `quake3game`
  • Loading branch information
abbradar committed Jan 14, 2016
1 parent a81b396 commit 7fc7502
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 109 deletions.
51 changes: 0 additions & 51 deletions pkgs/games/quake3/game/botlib.patch

This file was deleted.

43 changes: 0 additions & 43 deletions pkgs/games/quake3/game/default.nix

This file was deleted.

12 changes: 0 additions & 12 deletions pkgs/games/quake3/game/exit.patch

This file was deleted.

38 changes: 38 additions & 0 deletions pkgs/games/quake3/ioquake/default.nix
@@ -0,0 +1,38 @@
{ lib, stdenv, fetchgit, xlibsWrapper, SDL2, mesa, openalSoft
, curl, speex, opusfile, libogg, libopus, libjpeg, mumble, freetype
}:

stdenv.mkDerivation {
name = "ioquake3-git-20151228";

src = fetchgit {
url = "https://github.com/ioquake/ioq3";
rev = "fe619680f8fa9794906fc82a9c8c6113770696e6";
sha256 = "5462441df63eebee6f8ed19a8326de5f874dad31e124d37f73d3bab1cd656a87";
};

buildInputs = [ xlibsWrapper SDL2 mesa openalSoft curl speex opusfile libogg libopus libjpeg freetype mumble ];

NIX_CFLAGS_COMPILE = [ "-I${SDL2}/include/SDL2" "-I${opusfile}/include/opus" "-I${libopus}/include/opus" ];
NIX_CFLAGS_LINK = [ "-lSDL2" ];

enableParallelBuilding = true;

makeFlags = [ "USE_INTERNAL_LIBS=0" "USE_FREETYPE=1" "USE_OPENAL_DLOPEN=0" "USE_CURL_DLOPEN=0" ];

installTargets = [ "copyfiles" ];

installFlags = [ "COPYDIR=$(out)" ];

preInstall = ''
mkdir -p $out/baseq3
'';

meta = {
homepage = http://ioquake3.org/;
description = "First person shooter engine based on the Quake 3: Arena and Quake 3: Team Arena";
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.eelco lib.maintainers.abbradar ];
};
}
7 changes: 4 additions & 3 deletions pkgs/top-level/all-packages.nix
Expand Up @@ -14257,15 +14257,15 @@ let
qqwing = callPackage ../games/qqwing { };

quake3demo = callPackage ../games/quake3/wrapper {
name = "quake3-demo-${quake3game.name}";
name = "quake3-demo-${ioquake3.name}";
description = "Demo of Quake 3 Arena, a classic first-person shooter";
game = quake3game;
game = ioquake3;
paks = [quake3demodata];
};

quake3demodata = callPackage ../games/quake3/demo { };

quake3game = callPackage ../games/quake3/game { };
ioquake3 = callPackage ../games/quake3/ioquake { };

quantumminigolf = callPackage ../games/quantumminigolf {};

Expand Down Expand Up @@ -15906,6 +15906,7 @@ aliases = with self; rec {
saneFrontends = sane-frontends; # added 2016-01-02
btrfsProgs = btrfs-progs; # added 2016-01-03
aircrackng = aircrack-ng; # added 2016-01-14
quake3game = ioquake3; # added 2016-01-14
};

tweakAlias = _n: alias: with lib;
Expand Down

0 comments on commit 7fc7502

Please sign in to comment.