From 431c28a4a6aefd4a8a549ad87cdb5a755d445652 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 6 Dec 2022 22:06:58 +0100 Subject: tennix: 1.1 -> 1.3.1 --- pkgs/games/tennix/default.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'pkgs/games/tennix') diff --git a/pkgs/games/tennix/default.nix b/pkgs/games/tennix/default.nix index 809ed7a146d..bfcdb9c4c55 100644 --- a/pkgs/games/tennix/default.nix +++ b/pkgs/games/tennix/default.nix @@ -1,20 +1,21 @@ -{lib, stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_net, python2 } : +{ lib, stdenv, fetchgit, which, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_net, python3 } : stdenv.mkDerivation rec { pname = "tennix"; - version = "1.1"; - src = fetchurl { - url = "https://icculus.org/tennix/downloads/tennix-${version}.tar.gz"; - sha256 = "0np5kw1y7i0z0dsqx4r2nvmq86qj8hv3mmgavm3hxraqnds5z8cm"; + version = "1.3.1"; + + src = fetchgit { + url = git://repo.or.cz/tennix.git; + rev = "refs/tags/tennix-${version}"; + sha256 = "sha256-U5+S1jEeg+7gdM1++dln6ePTqxZu2Zt0oUrH3DIlkgk="; }; - buildInputs = [ python2 SDL SDL_mixer SDL_image SDL_ttf SDL_net ]; + nativeBuildInputs = [ which ]; - patches = [ ./fix_FTBFS.patch ]; + buildInputs = [ python3 SDL SDL_mixer SDL_image SDL_ttf SDL_net ]; - preConfigure = '' - makeFlags="PREFIX=$out" - installFlags="PREFIX=$out install" + configurePhase = '' + ./configure --prefix $out ''; meta = with lib; { -- cgit 1.4.1