From 01a140e64a5845117c6cc7d05f49fa1cb46ceb61 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Mon, 4 Aug 2025 07:38:02 +0200
Subject: [PATCH] sfizz: 1.2.1 -> 1.2.3

---
 pkgs/by-name/sf/sfizz/gcc13.patch | 13 -----------
 pkgs/by-name/sf/sfizz/package.nix | 36 +++++++++++--------------------
 2 files changed, 13 insertions(+), 36 deletions(-)
 delete mode 100644 pkgs/by-name/sf/sfizz/gcc13.patch

diff --git a/pkgs/by-name/sf/sfizz/gcc13.patch b/pkgs/by-name/sf/sfizz/gcc13.patch
deleted file mode 100644
index 9db969d25f3a..000000000000
--- a/pkgs/by-name/sf/sfizz/gcc13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Submodule plugins/vst/external/VST_SDK/VST3_SDK/public.sdk contains modified content
-diff --git a/plugins/vst/external/VST_SDK/VST3_SDK/public.sdk/source/vst/utility/stringconvert.h b/plugins/vst/external/VST_SDK/VST3_SDK/public.sdk/source/vst/utility/stringconvert.h
-index ff910aa..f15ae78 100644
---- a/plugins/vst/external/VST_SDK/VST3_SDK/public.sdk/source/vst/utility/stringconvert.h
-+++ b/plugins/vst/external/VST_SDK/VST3_SDK/public.sdk/source/vst/utility/stringconvert.h
-@@ -37,6 +37,7 @@
- #pragma once
- 
- #include "pluginterfaces/vst/vsttypes.h"
-+#include <cstdint>
- #include <string>
- 
- //------------------------------------------------------------------------
diff --git a/pkgs/by-name/sf/sfizz/package.nix b/pkgs/by-name/sf/sfizz/package.nix
index 08bade12ae73..931331a559b0 100644
--- a/pkgs/by-name/sf/sfizz/package.nix
+++ b/pkgs/by-name/sf/sfizz/package.nix
@@ -20,15 +20,15 @@
   catch2,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sfizz";
-  version = "1.2.1";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "sfztools";
     repo = "sfizz";
-    rev = version;
-    hash = "sha256-/G9tvJ4AcBSTmo44xDDKf6et1nSn/FV5m27ztDu10kI=";
+    tag = finalAttrs.version;
+    hash = "sha256-347olgxCyCRmKX0jxgBkYkoBuy9TMbsQgWOIoMppUAo=";
     fetchSubmodules = true;
   };
 
@@ -55,33 +55,23 @@ stdenv.mkDerivation rec {
     freetype
     pango
   ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
   ];
 
-  # Fix missing include
-  patches = [ ./gcc13.patch ];
-
-  postPatch = ''
-    cp ${catch2}/include/catch2/catch.hpp tests/catch2/catch.hpp
-
-    substituteInPlace plugins/editor/external/vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp \
-      --replace 'zenitypath = "zenity"' 'zenitypath = "${zenity}/bin/zenity"'
-    substituteInPlace plugins/editor/src/editor/NativeHelpers.cpp \
-      --replace '/usr/bin/zenity' '${zenity}/bin/zenity'
-  '';
-
-  cmakeFlags = [ "-DSFIZZ_TESTS=ON" ];
+  cmakeFlags = [
+    (lib.cmakeBool "SFIZZ_TESTS" true)
+  ];
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/sfztools/sfizz";
     description = "SFZ jack client and LV2 plugin";
-    license = licenses.bsd2;
-    maintainers = [ maintainers.magnetophon ];
-    platforms = platforms.all;
-    badPlatforms = platforms.darwin;
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ magnetophon ];
+    platforms = lib.platforms.linux;
   };
-}
+})