From 06d8530fb1a376a8e7fb0f33f0e47f8337f7000a Mon Sep 17 00:00:00 2001
From: Iwan <tracnar@gmail.com>
Date: Thu, 24 Apr 2025 21:27:02 +0200
Subject: [PATCH] jacktrip: 2.5.1 -> 2.6.0

Remove workaround for bug https://github.com/jacktrip/jacktrip/issues/1380
---
 pkgs/by-name/ja/jacktrip/package.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ja/jacktrip/package.nix b/pkgs/by-name/ja/jacktrip/package.nix
index 90b52661118e..69ceba29c2aa 100644
--- a/pkgs/by-name/ja/jacktrip/package.nix
+++ b/pkgs/by-name/ja/jacktrip/package.nix
@@ -5,6 +5,7 @@
   pkg-config,
   help2man,
   libjack2,
+  libsamplerate,
   dbus,
   qt6,
   meson,
@@ -16,7 +17,7 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "2.5.1";
+  version = "2.6.0";
   pname = "jacktrip";
 
   src = fetchFromGitHub {
@@ -24,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     repo = "jacktrip";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-WXUqMKCfZ/ZQLKpfye5cwju4IynitcBPEJwlQ2/+aoo=";
+    hash = "sha256-3Ae84x3QL+dfoJJJ0+XrBgo1wKwNYrR9AVQCnahS1sE=";
   };
 
   preConfigure = ''
@@ -36,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.qtbase
     qt6.qtwayland
     libjack2
+    libsamplerate
     dbus
   ];
 
@@ -56,10 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  # Can't link to libsamplerate
-  # https://github.com/jacktrip/jacktrip/issues/1380
-  mesonFlags = [ "-Dlibsamplerate=disabled" ];
-
   qmakeFlags = [ "jacktrip.pro" ];
 
   nativeInstallCheckInputs = [