lol

Merge pull request #29663 from womfoo/bump-fix/trackballs-1.2.3

trackballs: 1.1.4 (broken) -> 1.2.3

authored by

Joachim F and committed by
GitHub
22d9935a 8ab95028

+12 -28
+11 -24
pkgs/games/trackballs/default.nix
··· 1 - { stdenv, fetchurl, SDL, mesa, SDL_ttf, gettext, zlib, SDL_mixer, SDL_image, guile 2 - , debug ? false }: 1 + { stdenv, fetchFromGitHub, cmake, SDL2, SDL2_ttf, gettext, zlib, SDL2_mixer, SDL2_image, guile, mesa }: 3 2 4 3 with stdenv.lib; 5 4 6 5 stdenv.mkDerivation rec { 7 - name = "trackballs-1.1.4"; 8 - 9 - src = fetchurl { 10 - url = mirror://sourceforge/trackballs/trackballs-1.1.4.tar.gz; 11 - sha256 = "19ilnif59sxa8xmfisk90wngrd11pj8s86ixzypv8krm4znbm7a5"; 6 + name = "trackballs-${version}"; 7 + version = "1.2.3"; 8 + 9 + src = fetchFromGitHub { 10 + owner = "trackballs"; 11 + repo = "trackballs"; 12 + rev = "v${version}"; 13 + sha256 = "13f28frni7fkalxx4wqvmkzz7ba3d8pic9f9sd2z9wa6gbjs9zrf"; 12 14 }; 13 15 14 - buildInputs = [ zlib mesa SDL SDL_ttf SDL_mixer SDL_image guile gettext ]; 15 - 16 - hardeningDisable = [ "format" ]; 17 - 18 - CFLAGS = optionalString debug "-g -O0"; 19 - CXXFLAGS = CFLAGS; 20 - dontStrip = debug; 21 - postUnpack = optionalString debug 22 - "mkdir -p $out/src; cp -R * $out/src ; cd $out/src"; 23 - 24 - NIX_CFLAGS_COMPILE = "-iquote ${SDL.dev}/include/SDL"; 25 - configureFlags = optionalString debug "--enable-debug"; 26 - 27 - patchPhase = '' 28 - sed -i -e 's/images icons music/images music/' share/Makefile.in 29 - ''; 16 + buildInputs = [ cmake zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext mesa ]; 30 17 31 18 meta = { 32 - homepage = http://trackballs.sourceforge.net/; 19 + homepage = https://trackballs.github.io/; 33 20 description = "3D Marble Madness clone"; 34 21 platforms = stdenv.lib.platforms.linux; 35 22 };
+1 -4
pkgs/top-level/all-packages.nix
··· 17791 17791 17792 17792 tome4 = callPackage ../games/tome4 { }; 17793 17793 17794 - trackballs = callPackage ../games/trackballs { 17795 - debug = false; 17796 - guile = guile_1_8; 17797 - }; 17794 + trackballs = callPackage ../games/trackballs { }; 17798 17795 17799 17796 tremulous = callPackage ../games/tremulous { }; 17800 17797