From 8b6dc214d2d5977aba83d03040402f1b045afdef Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Thu, 26 Jun 2025 15:34:21 +0400
Subject: [PATCH 1/2] mp3blaster: fix build on darwin

---
 pkgs/by-name/mp/mp3blaster/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/mp/mp3blaster/package.nix b/pkgs/by-name/mp/mp3blaster/package.nix
index 0809970ade88..20932412940b 100644
--- a/pkgs/by-name/mp/mp3blaster/package.nix
+++ b/pkgs/by-name/mp/mp3blaster/package.nix
@@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
     ]
     ++ lib.optionals stdenv.cc.isClang [
       "-Wno-reserved-user-defined-literal"
+      "-Wno-register"
     ]
   );
 

From b0c205a093ec879d4e96e012e3a1e3dc125120a5 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Thu, 26 Jun 2025 16:43:27 +0400
Subject: [PATCH 2/2] mp3blaster: modernize

---
 pkgs/by-name/mp/mp3blaster/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/mp/mp3blaster/package.nix b/pkgs/by-name/mp/mp3blaster/package.nix
index 20932412940b..808fa4fa4c11 100644
--- a/pkgs/by-name/mp/mp3blaster/package.nix
+++ b/pkgs/by-name/mp/mp3blaster/package.nix
@@ -8,15 +8,15 @@
   SDL,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mp3blaster";
   version = "3.2.6";
 
   src = fetchFromGitHub {
     owner = "stragulus";
     repo = "mp3blaster";
-    rev = "v${version}";
-    sha256 = "0pzwml3yhysn8vyffw9q9p9rs8gixqkmg4n715vm23ib6wxbliqs";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Gke6OjcrDlF3CceSVyfu8SGd0004cef8RlZ76Aet/F8=";
   };
 
   patches = [
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     (fetchpatch {
       name = "ncurses-6.3.patch";
       url = "https://github.com/stragulus/mp3blaster/commit/62168cba5eaba6ffe56943552837cf033cfa96ed.patch";
-      sha256 = "088l27kl1l58lwxfnw5x2n64sdjy925ycphni3icwag7zvpj0xz1";
+      hash = "sha256-4Xcg7/7nKc7iiBZe5otIXjZNjBW9cOs6p6jQQOcRFCE=";
     })
   ];
 
@@ -44,11 +44,11 @@ stdenv.mkDerivation rec {
     ]
   );
 
-  meta = with lib; {
+  meta = {
     description = "Audio player for the text console";
     homepage = "http://www.mp3blaster.org/";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ earldouglas ];
-    platforms = with platforms; linux ++ darwin;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ earldouglas ];
+    platforms = with lib.platforms; linux ++ darwin;
   };
-}
+})