diff --git a/pkgs/by-name/su/superTuxKart/package.nix b/pkgs/by-name/su/superTuxKart/package.nix index 5b4cf6f8f577..35a74463adff 100644 --- a/pkgs/by-name/su/superTuxKart/package.nix +++ b/pkgs/by-name/su/superTuxKart/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, fetchsvn, - fetchpatch, cmake, pkg-config, makeWrapper, @@ -29,8 +28,8 @@ let assets = fetchsvn { url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets"; - rev = "18464"; - sha256 = "1a84j3psl4cxzkn5ynakpjill7i2f9ki2p729bpmbrvg8fki95aa"; + rev = "18621"; + sha256 = "sha256-iqQSezGu0tecA53qhrtYA77SLj28WUUCcL4ZCJbK5C8="; name = "stk-assets"; }; @@ -68,29 +67,15 @@ in stdenv.mkDerivation rec { pname = "supertuxkart"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "supertuxkart"; repo = "stk-code"; - rev = version; - hash = "sha256-gqdaVvgNfCN40ZO/9y8+vTeIJPSq6udKxYZ/MAi4ZMM="; + tag = version; + hash = "sha256-/fp5iqTHVrVcxRqbTy/3r+dp19oUj9MI2JauvtPWTWA="; }; - patches = [ - # upstreamed patches required to build against cmake 4.0; remove with next release update. - (fetchpatch { - name = "Require-Cmake-3.6-or-higher"; - url = "https://github.com/supertuxkart/stk-code/commit/7d4e8433c124c08c62f5335e2a884aeea71cf184.patch?full_index=1"; - hash = "sha256-5q/Gf1I/maFPQ83NDIa7Sn6gtLfErwxP16fup4SZ+gc="; - }) - (fetchpatch { - name = "Fixed-cmake-4.0-warnings"; - url = "https://github.com/supertuxkart/stk-code/commit/184c80138faf5232c33ff99ffe7706e821be70c2.patch?full_index=1"; - hash = "sha256-5zoDmKBRBC2rAUjgpmyc0ZCObGofjuImqk07Tr5K7Og="; - }) - ]; - postPatch = '' # Deletes all bundled libs in stk-code/lib except those # That couldn't be replaced with system packages @@ -162,17 +147,18 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Free 3D kart racing game"; + description = "3D open-source arcade racer"; mainProgram = "supertuxkart"; longDescription = '' - SuperTuxKart is a Free 3D kart racing game, with many tracks, - characters and items for you to try, similar in spirit to Mario - Kart. + Karts. Nitro. Action! SuperTuxKart is a 3D open-source arcade racer + with a variety of characters, tracks, and modes to play. + It aims to be more fun than realistic, and provides an enjoyable experience for all ages. ''; homepage = "https://supertuxkart.net/"; - license = lib.licenses.gpl2Plus; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ peterhoeg + SchweGELBin ]; platforms = with lib.platforms; unix; changelog = "https://github.com/supertuxkart/stk-code/blob/${version}/CHANGELOG.md";