From 3981d04f63563f2a155cddc07ce51627f67e9c7f Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 18 Mar 2026 01:09:18 +0100
Subject: [PATCH 1/2] zxtune: unbreak build

fixes https://hydra.nixos.org/build/317966891
---
 pkgs/by-name/zx/zxtune/package.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/by-name/zx/zxtune/package.nix b/pkgs/by-name/zx/zxtune/package.nix
index 8a6d5714c248..efdbe73d2aea 100644
--- a/pkgs/by-name/zx/zxtune/package.nix
+++ b/pkgs/by-name/zx/zxtune/package.nix
@@ -2,6 +2,8 @@
   lib,
   stdenv,
   fetchFromBitbucket,
+  fetchpatch2,
+  dos2unix,
   nix-update-script,
   boost,
   zlib,
@@ -77,7 +79,22 @@ stdenv.mkDerivation rec {
 
   buildInputs = staticBuildInputs ++ dlopenBuildInputs;
 
+  prePatch = ''
+    # update-vgm.patch : Hunk #1 FAILED at 18 (different line endings)
+    find 3rdparty/vgm/ -type f -exec ${dos2unix}/bin/dos2unix {} \;
+  '';
   patches = [
+    # fix https://hydra.nixos.org/build/317966891
+    (fetchpatch2 {
+      name = "xmp-fix-for-gcc-15.patch";
+      url = "https://github.com/vitamin-caig/zxtune/commit/7f853a38924f78a25b86ac674b41e2f0fd2524a5.patch?full_index=1";
+      hash = "sha256-F6gD+w4lFymSRHXgDngYX/dZI26f7onOmYFlHkPKms8=";
+    })
+    (fetchpatch2 {
+      name = "update-vgm.patch";
+      url = "https://github.com/vitamin-caig/zxtune/commit/31e3ff7a8d13b72e6f72caecd15ae87cefca0465.patch?full_index=1";
+      hash = "sha256-uEa2LY/r/jVWHHEpFtsQba66YdIjA82fDlm+StKp/EI=";
+    })
     ./disable_updates.patch
   ];
 

From caf761612122de68f314a96ffbc0deeb15ee6116 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 18 Mar 2026 01:09:49 +0100
Subject: [PATCH 2/2] zxtune: add pbsds to maintainers

---
 pkgs/by-name/zx/zxtune/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/zx/zxtune/package.nix b/pkgs/by-name/zx/zxtune/package.nix
index efdbe73d2aea..fe9d2bfcb86a 100644
--- a/pkgs/by-name/zx/zxtune/package.nix
+++ b/pkgs/by-name/zx/zxtune/package.nix
@@ -193,7 +193,10 @@ stdenv.mkDerivation rec {
     # zxtune supports mac and windows, but more work will be needed to
     # integrate with the custom make system (see platformName above)
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ EBADBEEF ];
+    maintainers = with lib.maintainers; [
+      pbsds
+      EBADBEEF
+    ];
     mainProgram = if withQt then "zxtune-qt" else "zxtune123";
   };
 }