From aff8243f340a53938c209ec8e2e8ffe7262d62b1 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Tue, 15 Apr 2025 10:00:14 +0200 Subject: [PATCH 1/2] trackballs: fix build On the update of SDL2_ttf from 2.22.0 -> 2.24.0, trackballs got broken. The relevant commit in SDL2_ttf is 22347419ee08e49d77411c680f15e314ef870ab7, which renamed the struct _TTF_Font to TTF_Font. --- pkgs/by-name/tr/trackballs/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/tr/trackballs/package.nix b/pkgs/by-name/tr/trackballs/package.nix index 1b21058149a1..c01235a7a806 100644 --- a/pkgs/by-name/tr/trackballs/package.nix +++ b/pkgs/by-name/tr/trackballs/package.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-JKSiNe5mu8rRztUhduGFY6IsSMx6VyBqKcGO5EssI+8="; }; + postPatch = '' + substituteInPlace src/glHelp.h --replace-fail _TTF_Font TTF_Font + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib From 0c673a8c30114d111c27cd9b3a335e31e90c9e04 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Tue, 15 Apr 2025 10:02:24 +0200 Subject: [PATCH 2/2] trackballs: modernize --- pkgs/by-name/tr/trackballs/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/tr/trackballs/package.nix b/pkgs/by-name/tr/trackballs/package.nix index c01235a7a806..fa1f14d7d06c 100644 --- a/pkgs/by-name/tr/trackballs/package.nix +++ b/pkgs/by-name/tr/trackballs/package.nix @@ -14,15 +14,15 @@ libGL, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "trackballs"; version = "1.3.4"; src = fetchFromGitHub { owner = "trackballs"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-JKSiNe5mu8rRztUhduGFY6IsSMx6VyBqKcGO5EssI+8="; + repo = "trackballs"; + tag = "v${finalAttrs.version}"; + hash = "sha256-JKSiNe5mu8rRztUhduGFY6IsSMx6VyBqKcGO5EssI+8="; }; postPatch = '' @@ -42,12 +42,12 @@ stdenv.mkDerivation rec { libGL ]; - meta = with lib; { + meta = { homepage = "https://trackballs.github.io/"; description = "3D Marble Madness clone"; mainProgram = "trackballs"; - platforms = platforms.linux; + platforms = lib.platforms.linux; # Music is licensed under Ethymonics Free Music License. - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; -} +})