From 85356ccf966b67fd6fc509d481a7f4ddcb08187d Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 5 May 2026 10:41:26 +0300
Subject: [PATCH 1/3] mpd-touch-screen-gui: use substituteInPlace with
 --replace-fail for patch

---
 pkgs/by-name/mp/mpd-touch-screen-gui/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/mp/mpd-touch-screen-gui/package.nix b/pkgs/by-name/mp/mpd-touch-screen-gui/package.nix
index 6777331a99e5..174a16c81602 100644
--- a/pkgs/by-name/mp/mpd-touch-screen-gui/package.nix
+++ b/pkgs/by-name/mp/mpd-touch-screen-gui/package.nix
@@ -32,7 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postPatch = ''
-    sed -i s#/usr/share/fonts/TTF#${dejavu_fonts}/share/fonts/truetype#g data/program.conf
+    substituteInPlace data/program.conf \
+      --replace-fail /usr/share/fonts/TTF ${dejavu_fonts}/share/fonts/truetype
   '';
 
   buildInputs = [

From 30560595b9e95e673f77633806d844c633dcacf5 Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Mon, 4 May 2026 14:35:45 -0700
Subject: [PATCH 2/3] mpd-touch-screen-gui: fix build with gcc15

Co-Authored-By: Doron Behar <doron.behar@gmail.com>
---
 pkgs/by-name/mp/mpd-touch-screen-gui/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/mp/mpd-touch-screen-gui/package.nix b/pkgs/by-name/mp/mpd-touch-screen-gui/package.nix
index 174a16c81602..b921ddd91ac3 100644
--- a/pkgs/by-name/mp/mpd-touch-screen-gui/package.nix
+++ b/pkgs/by-name/mp/mpd-touch-screen-gui/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   pkg-config,
   autoreconfHook,
   SDL2,
@@ -25,6 +26,13 @@ stdenv.mkDerivation (finalAttrs: {
     rev = "156eaebede89da2b83a98d8f9dfa46af12282fb4";
     sha256 = "sha256-vr/St4BghrndjUQ0nZI/uJq+F/MjEj6ulc4DYwQ/pgU=";
   };
+  patches = [
+    # Fixes build with gcc15. See: https://github.com/muesli4/mpd-touch-screen-gui/pull/15
+    (fetchpatch {
+      url = "https://github.com/muesli4/mpd-touch-screen-gui/pull/15/commits/ecbe6fe2d7e30b81584e1f15e3003e0dba013f24.patch";
+      hash = "sha256-p4TywZl7SQrMsKGEZgcctTY5DgnIWddQSFadVpyCbTU=";
+    })
+  ];
 
   nativeBuildInputs = [
     pkg-config

From 44c2d622e5df7beb45f914ba716e4eb2f9730ba4 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 5 May 2026 10:49:43 +0300
Subject: [PATCH 3/3] mpd-touch-screen-gui: use lib.withFeatureAs in
 configureFlags

---
 pkgs/by-name/mp/mpd-touch-screen-gui/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/mp/mpd-touch-screen-gui/package.nix b/pkgs/by-name/mp/mpd-touch-screen-gui/package.nix
index b921ddd91ac3..5a0e84f21455 100644
--- a/pkgs/by-name/mp/mpd-touch-screen-gui/package.nix
+++ b/pkgs/by-name/mp/mpd-touch-screen-gui/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   # https://stackoverflow.com/questions/53089494/configure-error-could-not-find-a-version-of-the-library
   configureFlags = [
-    "--with-boost-libdir=${boost.out}/lib"
+    (lib.withFeatureAs true "boost-libdir" "${lib.getLib boost}/lib")
   ];
 
   doCheck = true;