trackballs: 1.1.4 (broken) -> 1.2.3

This commit is contained in:
Kranium Gikos Mendoza 2017-09-22 21:37:26 +10:00
parent 116c34a748
commit 92ec5cddbc
2 changed files with 12 additions and 28 deletions

View file

@ -1,35 +1,22 @@
{ stdenv, fetchurl, SDL, mesa, SDL_ttf, gettext, zlib, SDL_mixer, SDL_image, guile
, debug ? false }:
{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_ttf, gettext, zlib, SDL2_mixer, SDL2_image, guile, mesa }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "trackballs-1.1.4";
src = fetchurl {
url = mirror://sourceforge/trackballs/trackballs-1.1.4.tar.gz;
sha256 = "19ilnif59sxa8xmfisk90wngrd11pj8s86ixzypv8krm4znbm7a5";
name = "trackballs-${version}";
version = "1.2.3";
src = fetchFromGitHub {
owner = "trackballs";
repo = "trackballs";
rev = "v${version}";
sha256 = "13f28frni7fkalxx4wqvmkzz7ba3d8pic9f9sd2z9wa6gbjs9zrf";
};
buildInputs = [ zlib mesa SDL SDL_ttf SDL_mixer SDL_image guile gettext ];
hardeningDisable = [ "format" ];
CFLAGS = optionalString debug "-g -O0";
CXXFLAGS = CFLAGS;
dontStrip = debug;
postUnpack = optionalString debug
"mkdir -p $out/src; cp -R * $out/src ; cd $out/src";
NIX_CFLAGS_COMPILE = "-iquote ${SDL.dev}/include/SDL";
configureFlags = optionalString debug "--enable-debug";
patchPhase = ''
sed -i -e 's/images icons music/images music/' share/Makefile.in
'';
buildInputs = [ cmake zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext mesa ];
meta = {
homepage = http://trackballs.sourceforge.net/;
homepage = https://trackballs.github.io/;
description = "3D Marble Madness clone";
platforms = stdenv.lib.platforms.linux;
};

View file

@ -17752,10 +17752,7 @@ with pkgs;
tome4 = callPackage ../games/tome4 { };
trackballs = callPackage ../games/trackballs {
debug = false;
guile = guile_1_8;
};
trackballs = callPackage ../games/trackballs { };
tremulous = callPackage ../games/tremulous { };