From 30d7a3f7b6627c684f0af3846a31118b644815c5 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Tue, 22 Oct 2024 19:39:51 +0800
Subject: [PATCH 1/3] jalv: move to pkgs/by-name

---
 .../audio/jalv/default.nix => by-name/ja/jalv/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/audio/jalv/default.nix => by-name/ja/jalv/package.nix} (100%)

diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/by-name/ja/jalv/package.nix
similarity index 100%
rename from pkgs/applications/audio/jalv/default.nix
rename to pkgs/by-name/ja/jalv/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 982de17fe824..3227959181d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30229,8 +30229,6 @@ with pkgs;
 
   jaeles = callPackage ../tools/security/jaeles { };
 
-  jalv = callPackage ../applications/audio/jalv { };
-
   jameica = callPackage ../applications/office/jameica {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };

From 1f3dcfb1a928850c96f62dc18887df2db0f6ce9f Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Tue, 22 Oct 2024 19:40:16 +0800
Subject: [PATCH 2/3] jalv: format with nixfmt-rfc-style

---
 pkgs/by-name/ja/jalv/package.nix | 35 +++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ja/jalv/package.nix b/pkgs/by-name/ja/jalv/package.nix
index b17460e4e2e7..3c60f9c6413d 100644
--- a/pkgs/by-name/ja/jalv/package.nix
+++ b/pkgs/by-name/ja/jalv/package.nix
@@ -1,7 +1,21 @@
-{ lib, stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkg-config, python3
-, serd, sord , sratom, suil, wafHook }:
+{
+  lib,
+  stdenv,
+  fetchurl,
+  gtk2,
+  libjack2,
+  lilv,
+  lv2,
+  pkg-config,
+  python3,
+  serd,
+  sord,
+  sratom,
+  suil,
+  wafHook,
+}:
 
-stdenv.mkDerivation  rec {
+stdenv.mkDerivation rec {
   pname = "jalv";
   version = "1.6.6";
 
@@ -10,9 +24,20 @@ stdenv.mkDerivation  rec {
     sha256 = "sha256-ktFBeBtmQ3MgfDQ868XpuM7UYfryb9zLld8AB7BjnhY=";
   };
 
-  nativeBuildInputs = [ pkg-config wafHook ];
+  nativeBuildInputs = [
+    pkg-config
+    wafHook
+  ];
   buildInputs = [
-    gtk2 libjack2 lilv lv2 python3 serd sord sratom suil
+    gtk2
+    libjack2
+    lilv
+    lv2
+    python3
+    serd
+    sord
+    sratom
+    suil
   ];
 
   meta = with lib; {

From ca0aa4dabc25b5320909501cb6835a63be6db698 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Tue, 22 Oct 2024 20:03:31 +0800
Subject: [PATCH 3/3] jalv: 1.6.6 -> 1.6.8

---
 pkgs/by-name/ja/jalv/package.nix | 71 ++++++++++++++++++++------------
 pkgs/top-level/all-packages.nix  |  2 +
 2 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/pkgs/by-name/ja/jalv/package.nix b/pkgs/by-name/ja/jalv/package.nix
index 3c60f9c6413d..f801039fb069 100644
--- a/pkgs/by-name/ja/jalv/package.nix
+++ b/pkgs/by-name/ja/jalv/package.nix
@@ -1,50 +1,69 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  gtk2,
+  fetchFromGitHub,
+  libsForQt5,
   libjack2,
   lilv,
   lv2,
+  meson,
+  ninja,
   pkg-config,
-  python3,
+  portaudio,
   serd,
   sord,
   sratom,
   suil,
-  wafHook,
+  wrapGAppsHook3,
+  useJack ? true,
+  useQt ? false,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "jalv";
-  version = "1.6.6";
+  version = "1.6.8";
 
-  src = fetchurl {
-    url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-ktFBeBtmQ3MgfDQ868XpuM7UYfryb9zLld8AB7BjnhY=";
+  src = fetchFromGitHub {
+    owner = "drobilla";
+    repo = "jalv";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-MAQoc+WcuoG6Psa44VRaZ2TWB2LBpvf6EmqbUZPUf38=";
   };
 
   nativeBuildInputs = [
+    meson
+    ninja
     pkg-config
-    wafHook
-  ];
-  buildInputs = [
-    gtk2
-    libjack2
-    lilv
-    lv2
-    python3
-    serd
-    sord
-    sratom
-    suil
+  ] ++ lib.optionals (!useQt) [ wrapGAppsHook3 ] ++ lib.optionals useQt [ libsForQt5.wrapQtAppsHook ];
+
+  buildInputs =
+    [
+      lilv
+      lv2
+      portaudio
+      serd
+      sord
+      sratom
+      suil
+    ]
+    ++ lib.optionals (!useJack) [ portaudio ]
+    ++ lib.optionals useJack [ libjack2 ]
+    ++ lib.optionals useQt [ libsForQt5.qtbase ];
+
+  mesonFlags = [
+    (lib.mesonEnable "portaudio" (!useJack))
+    (lib.mesonEnable "jack" useJack)
+    (lib.mesonEnable "gtk2" false)
+    (lib.mesonEnable "gtk3" (!useQt))
+    (lib.mesonEnable "qt5" useQt)
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Simple but fully featured LV2 host for Jack";
     homepage = "http://drobilla.net/software/jalv";
-    license = licenses.isc;
-    maintainers = [ ];
-    platforms = platforms.linux;
+    license = lib.licenses.isc;
+    mainProgram = if useQt then "jalv.qt5" else "jalv.gtk3";
+    maintainers = with lib.maintainers; [ aleksana ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3227959181d3..daab9a286474 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30229,6 +30229,8 @@ with pkgs;
 
   jaeles = callPackage ../tools/security/jaeles { };
 
+  jalv-qt = jalv.override { useQt = true; };
+
   jameica = callPackage ../applications/office/jameica {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };