From f85e2e1eeb442c0b0a8afb8e224f8a6a039b5664 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20H=C3=BCrlimann?=
Date: Tue, 13 Oct 2020 23:12:09 +0200 Subject: [PATCH] trigger: 0.6.6 -> 0.6.6.1 fix linker flag for trigger added tinyxml-2 as dependency as it's not shipped anymore improved description --- pkgs/games/trigger/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index c6f31922bb6d..e5a299052ddb 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -1,20 +1,23 @@ -{ fetchurl, stdenv, runtimeShell -, SDL2, freealut, SDL2_image, openal, physfs, zlib, libGLU, libGL, glew }: +{ fetchurl, stdenv, runtimeShell, SDL2, freealut, SDL2_image, openal, physfs +, zlib, libGLU, libGL, glew, tinyxml-2 }: stdenv.mkDerivation rec { - name = "trigger-rally-0.6.6"; + name = "trigger-rally-0.6.6.1"; src = fetchurl { url = "mirror://sourceforge/trigger-rally/${name}.tar.gz"; - sha256 = "08qa2f2s8zyn42ff6jb1gsi64d916020ixkzvl16kbb88rabqra8"; + sha256 = "016bc2hczqscfmngacim870hjcsmwl8r3aq8x03vpf22s49nw23z"; }; - buildInputs = [ SDL2 freealut SDL2_image openal physfs zlib libGLU libGL glew ]; + buildInputs = + [ SDL2 freealut SDL2_image openal physfs zlib libGLU libGL glew tinyxml-2 ]; preConfigure = '' sed s,/usr/local,$out, -i bin/*defs cd src + + sed s,lSDL2main,lSDL2, -i GNUmakefile export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL2.dev}/include/SDL2" export makeFlags="$makeFlags prefix=$out" ''; @@ -31,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Rally"; + description = "A fast-paced single-player racing game"; homepage = "http://trigger-rally.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric];