From 0e394359f956ff6a412487acb30ac51c90527991 Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Sat, 2 May 2026 23:20:13 -0700
Subject: [PATCH 1/3] sonic-lineup: fix build with gcc15

---
 pkgs/by-name/so/sonic-lineup/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/so/sonic-lineup/package.nix b/pkgs/by-name/so/sonic-lineup/package.nix
index 4a95a4a89b96..84cd80b8c286 100644
--- a/pkgs/by-name/so/sonic-lineup/package.nix
+++ b/pkgs/by-name/so/sonic-lineup/package.nix
@@ -45,6 +45,12 @@ stdenv.mkDerivation (finalAttrs: {
       sha256 = "sha256-DOCdQqCihkR0g/6m90DbJxw00QTpyVmFzCxagrVWKiI=";
     })
     ./match-vamp.patch
+    (fetchpatch2 {
+      url = "https://github.com/piper-audio/piper-vamp-cpp/commit/6f16a09b78b995b3cf2844f00033bde90e5e0936.patch?full_index=1";
+      stripLen = 1;
+      extraPrefix = "piper-vamp-cpp/";
+      hash = "sha256-G9O9t1Niesffj4bDFO0q8KMgygTdYJUVHkq/7nkGSRk=";
+    })
   ];
 
   buildInputs = [

From 2e29ac564d2302a8963c5407448bdff76e4006ce Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Sat, 2 May 2026 23:24:00 -0700
Subject: [PATCH 2/3] sonic-lineup: cleanup, add full_index for patch

---
 pkgs/by-name/so/sonic-lineup/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/so/sonic-lineup/package.nix b/pkgs/by-name/so/sonic-lineup/package.nix
index 84cd80b8c286..b506c4ad8ba7 100644
--- a/pkgs/by-name/so/sonic-lineup/package.nix
+++ b/pkgs/by-name/so/sonic-lineup/package.nix
@@ -10,6 +10,7 @@
   fftwFloat,
   libfishsound,
   libid3tag,
+  libjack2,
   liblo,
   libmad,
   liboggz,
@@ -23,9 +24,8 @@
   serd,
   sord,
   capnproto,
-  pkg-config,
-  libjack2,
   libsForQt5,
+  pkg-config,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -39,10 +39,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     (fetchpatch2 {
-      url = "https://github.com/sonic-visualiser/svcore/commit/5a7b517e43b7f0b3f03b7fc3145102cf4e5b0ffc.patch";
+      url = "https://github.com/sonic-visualiser/svcore/commit/5a7b517e43b7f0b3f03b7fc3145102cf4e5b0ffc.patch?full_index=1";
       stripLen = 1;
       extraPrefix = "svcore/";
-      sha256 = "sha256-DOCdQqCihkR0g/6m90DbJxw00QTpyVmFzCxagrVWKiI=";
+      hash = "sha256-ReFOGRyM7IXKOUuzNoGIVX+C+zMz3/fftQN7k5BHp0k=";
     })
     ./match-vamp.patch
     (fetchpatch2 {
@@ -57,10 +57,12 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     boost
     bzip2
+    capnproto
     fftw
     fftwFloat
     libfishsound
     libid3tag
+    libjack2
     liblo
     libmad
     liboggz
@@ -73,14 +75,12 @@ stdenv.mkDerivation (finalAttrs: {
     rubberband
     serd
     sord
-    capnproto
-    libjack2
   ];
 
   nativeBuildInputs = [
     capnproto # capnp
-    pkg-config
     libsForQt5.wrapQtAppsHook
+    pkg-config
   ];
 
   strictDeps = true;

From 59b64b4411e0f85f6eafad2a647907bc79841227 Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Sat, 2 May 2026 23:27:33 -0700
Subject: [PATCH 3/3] sonic-lineup: fix qt wrapping

---
 pkgs/by-name/so/sonic-lineup/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/so/sonic-lineup/package.nix b/pkgs/by-name/so/sonic-lineup/package.nix
index b506c4ad8ba7..f8aa538eeac4 100644
--- a/pkgs/by-name/so/sonic-lineup/package.nix
+++ b/pkgs/by-name/so/sonic-lineup/package.nix
@@ -63,6 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
     libfishsound
     libid3tag
     libjack2
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     liblo
     libmad
     liboggz