From 2e4e939240c2d6b5b8fd21bfa0fb8ad9dbdc0e30 Mon Sep 17 00:00:00 2001 From: "B. Kelly" Date: Sat, 10 Aug 2019 07:03:29 -0400 Subject: [PATCH] crossfire-client: init at 1.75.0 The client is still getting official releases on a fairly frequent basis, so this package tracks those rather than SVN head. --- pkgs/games/crossfire/crossfire-client.nix | 32 +++++++++++++++++++++++ pkgs/games/crossfire/default.nix | 6 +++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 pkgs/games/crossfire/crossfire-client.nix diff --git a/pkgs/games/crossfire/crossfire-client.nix b/pkgs/games/crossfire/crossfire-client.nix new file mode 100644 index 000000000000..799ae4ab6ee7 --- /dev/null +++ b/pkgs/games/crossfire/crossfire-client.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchsvn +, cmake, pkg-config, perl, vala +, gtk2, pcre, zlib, libpng, fribidi, harfbuzzFull, xorg, util-linux, curl +, SDL, SDL_image, SDL_mixer, libselinux, libsepol +, version, rev, sha256 +}: + +stdenv.mkDerivation rec { + pname = "crossfire-client"; + version = "r${toString rev}"; + + src = fetchsvn { + url = "http://svn.code.sf.net/p/crossfire/code/client/trunk/"; + sha256 = sha256; + rev = rev; + }; + + nativeBuildInputs = [ cmake pkg-config perl vala ]; + buildInputs = [ + gtk2 pcre zlib libpng fribidi harfbuzzFull xorg.libpthreadstubs + xorg.libXdmcp curl SDL SDL_image SDL_mixer util-linux libselinux libsepol + ]; + hardeningDisable = [ "format" ]; + + meta = with lib; { + description = "GTKv2 client for the Crossfire free MMORPG"; + homepage = "http://crossfire.real-time.com/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ToxicFrog ]; + }; +} diff --git a/pkgs/games/crossfire/default.nix b/pkgs/games/crossfire/default.nix index cfe6448928c0..bc74c00bcce4 100644 --- a/pkgs/games/crossfire/default.nix +++ b/pkgs/games/crossfire/default.nix @@ -1,6 +1,12 @@ { callPackage, ... }: rec { + crossfire-client = callPackage ./crossfire-client.nix { + version = "1.75.0"; + rev = 21760; + sha256 = "0b42sak8hj60nywfswkps777asy9p8r9wsn7pmj2nqbd29ng1p9d"; + }; + crossfire-server = callPackage ./crossfire-server.nix { version = "latest"; rev = 22111; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7d7ad654f3e..c7bc556b612b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29097,7 +29097,7 @@ in crawl = callPackage ../games/crawl { }; inherit (import ../games/crossfire pkgs) - crossfire-server crossfire-arch crossfire-maps; + crossfire-server crossfire-arch crossfire-maps crossfire-client; crrcsim = callPackage ../games/crrcsim {};