From 7efc41c7b0c784bd3efc13a305a3d1b0ff5ff517 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 10 May 2025 17:25:43 -0700
Subject: [PATCH 1/2] adlplug: modernize

---
 pkgs/applications/audio/adlplug/default.nix | 22 ++++++++++-----------
 pkgs/top-level/all-packages.nix             |  8 ++------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/applications/audio/adlplug/default.nix
index bf1278e42ce8..16fb9beb6825 100644
--- a/pkgs/applications/audio/adlplug/default.nix
+++ b/pkgs/applications/audio/adlplug/default.nix
@@ -16,7 +16,7 @@
 
   # Enabling JACK requires a JACK server at runtime, no fallback mechanism
   withJack ? false,
-  jack,
+  libjack2,
 
   type ? "ADL",
 }:
@@ -34,7 +34,7 @@ let
     .${type};
   mainProgram = "${type}plug";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "${lib.strings.toLower type}plug";
   version = "unstable-2021-12-17";
 
@@ -47,9 +47,9 @@ stdenv.mkDerivation rec {
   };
 
   cmakeFlags = [
-    "-DADLplug_CHIP=${chip}"
-    "-DADLplug_USE_SYSTEM_FMT=ON"
-    "-DADLplug_Jack=${if withJack then "ON" else "OFF"}"
+    (lib.cmakeFeature "ADLplug_CHIP" chip)
+    (lib.cmakeBool "ADLplug_USE_SYSTEM_FMT" true)
+    (lib.cmakeBool "ADLplug_Jack" withJack)
   ];
 
   NIX_LDFLAGS = toString (
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
       libXext
       libXcursor
     ]
-    ++ lib.optional withJack jack;
+    ++ lib.optionals withJack [ libjack2 ];
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir -p $out/{Applications,Library/Audio/Plug-Ins/{VST,Components}}
@@ -100,12 +100,12 @@ stdenv.mkDerivation rec {
     mv au/${mainProgram}.component $out/Library/Audio/Plug-Ins/Components/
   '';
 
-  meta = with lib; {
+  meta = {
     inherit mainProgram;
     description = "${chip} FM Chip Synthesizer";
-    homepage = src.meta.homepage;
-    license = licenses.boost;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ OPNA2608 ];
+    homepage = "https://github.com/jpcima/ADLplug";
+    license = lib.licenses.boost;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ OPNA2608 ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad1bacc7f5e4..848da322ddbe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1011,12 +1011,8 @@ with pkgs;
 
   actdiag = with python3.pkgs; toPythonApplication actdiag;
 
-  adlplug = callPackage ../applications/audio/adlplug {
-    jack = libjack2;
-  };
-  opnplug = adlplug.override {
-    type = "OPN";
-  };
+  adlplug = callPackage ../applications/audio/adlplug {};
+  opnplug = adlplug.override { type = "OPN"; };
 
   akkoma = callPackage ../by-name/ak/akkoma/package.nix {
     beamPackages = beam_minimal.packages.erlang_26.extend (

From bd44edb8f3d806fb792140b2040d647448257bec Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 10 May 2025 17:27:35 -0700
Subject: [PATCH 2/2] adlplug: move to by-name

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

diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/by-name/ad/adlplug/package.nix
similarity index 100%
rename from pkgs/applications/audio/adlplug/default.nix
rename to pkgs/by-name/ad/adlplug/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 848da322ddbe..889d36b819e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1011,7 +1011,6 @@ with pkgs;
 
   actdiag = with python3.pkgs; toPythonApplication actdiag;
 
-  adlplug = callPackage ../applications/audio/adlplug {};
   opnplug = adlplug.override { type = "OPN"; };
 
   akkoma = callPackage ../by-name/ak/akkoma/package.nix {