Merge pull request #204859 from pSub/pSub/update-tennix

authored by Sandro and committed by GitHub e55ba3c3 493419b0

+11 -10
+11 -10
pkgs/games/tennix/default.nix
··· 1 - {lib, stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_net, python2 } : 1 + { lib, stdenv, fetchgit, which, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_net, python3 } : 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "tennix"; 5 - version = "1.1"; 6 - src = fetchurl { 7 - url = "https://icculus.org/tennix/downloads/tennix-${version}.tar.gz"; 8 - sha256 = "0np5kw1y7i0z0dsqx4r2nvmq86qj8hv3mmgavm3hxraqnds5z8cm"; 5 + version = "1.3.1"; 6 + 7 + src = fetchgit { 8 + url = git://repo.or.cz/tennix.git; 9 + rev = "refs/tags/tennix-${version}"; 10 + sha256 = "sha256-U5+S1jEeg+7gdM1++dln6ePTqxZu2Zt0oUrH3DIlkgk="; 9 11 }; 10 12 11 - buildInputs = [ python2 SDL SDL_mixer SDL_image SDL_ttf SDL_net ]; 13 + nativeBuildInputs = [ which ]; 12 14 13 - patches = [ ./fix_FTBFS.patch ]; 15 + buildInputs = [ python3 SDL SDL_mixer SDL_image SDL_ttf SDL_net ]; 14 16 15 - preConfigure = '' 16 - makeFlags="PREFIX=$out" 17 - installFlags="PREFIX=$out install" 17 + configurePhase = '' 18 + ./configure --prefix $out 18 19 ''; 19 20 20 21 meta = with lib; {