git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #111273 from numinit/armagetronad
commit2f79819ce2581ffaddf6ce1c468113805f3ac86c authorSandro <sandro.jaeckel@gmail.com> dateWed 3 Feb 2021, 11:45 (6 years ago) parente7288c3833ccba
2 files changed+27−13
pkgs/games/armagetronad/default.nix+25−13 pkgs/top-level/all-packages.nix+2
pkgs/games/armagetronad/default.nix+25−13
@@ -1,30 +1,42 @@
1−{ lib, stdenv, fetchurl, SDL, libxml2, SDL_image, libjpeg, libpng, libGLU, libGL, zlib }:
1+{ lib, stdenv, fetchurl
2+, pkg-config, SDL, libxml2, SDL_image, libjpeg, libpng, libGLU, libGL, zlib
3+, dedicatedServer ? false }:
24
35let
4− versionMajor = "0.2.8";
5− versionMinor = "3.5";
6+ versionMajor = "0.2.9";
7+ versionMinor = "1.0";
68 version = "${versionMajor}.${versionMinor}";
79in
8−
910stdenv.mkDerivation {
10− pname = "armagetron";
11+ pname = if dedicatedServer then "armagetronad-dedicated" else "armagetronad";
1112 inherit version;
1213 src = fetchurl {
13− url = "https://launchpad.net/armagetronad/${versionMajor}/${versionMajor}.${versionMinor}/+download/armagetronad-${version}.src.tar.bz2";
14− sha256 = "1vyja7mzivs3pacxb7kznndsgqhq4p0f7x2zg55dckvzqwprdhqx";
14+ url = "https://launchpad.net/armagetronad/${versionMajor}/${version}/+download/armagetronad-${version}.tbz";
15+ sha256 = "sha256-WbbHwBzj+MylQ34z+XSmN1KVQaEapPUsGlwXSZ4m9qE";
1516 };
1617
17− NIX_LDFLAGS = "-lSDL_image";
18−
1918 enableParallelBuilding = true;
2019
21− configureFlags = [ "--disable-etc" ];
22− buildInputs = [ SDL SDL_image libxml2 libjpeg libpng libGLU libGL zlib ];
20+ configureFlags = [
21+ "--enable-memmanager"
22+ "--enable-automakedefaults"
23+ "--disable-useradd"
24+ "--disable-initscripts"
25+ "--disable-etc"
26+ "--disable-uninstall"
27+ "--disable-sysinstall"
28+ ] ++ lib.optional dedicatedServer "--enable-dedicated";
29+
30+ nativeBuildInputs = [ pkg-config ];
31+
32+ buildInputs = [ libxml2 zlib ]
33+ ++ lib.optionals (!dedicatedServer) [ SDL SDL_image libxml2 libjpeg libpng libGLU libGL ];
2334
2435 meta = with lib; {
2536 homepage = "http://armagetronad.org";
26− description = "An multiplayer networked arcade racing game in 3D similar to Tron";
27− license = licenses.gpl2;
37+ description = "A multiplayer networked arcade racing game in 3D similar to Tron";
38+ maintainers = with maintainers; [ numinit ];
39+ license = licenses.gpl2Plus;
2840 platforms = platforms.linux;
2941 };
3042}
pkgs/top-level/all-packages.nix+2
@@ -26330,6 +26330,8 @@ in
2633026330
2633126331 armagetronad = callPackage ../games/armagetronad { };
2633226332
26333+ armagetronad-dedicated = callPackage ../games/armagetronad { dedicatedServer = true; };
26334+
2633326335 arena = callPackage ../games/arena {};
2633426336
2633526337 arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { };