From 3bdf74b5db6bea11f9d1564f0b0054a4fa291053 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 18 Jul 2025 08:23:35 -0500
Subject: [PATCH 1/2] hydrogen: migrate to by-name

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

diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/by-name/hy/hydrogen/package.nix
similarity index 100%
rename from pkgs/applications/audio/hydrogen/default.nix
rename to pkgs/by-name/hy/hydrogen/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5a5df1edd29..829e198da173 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12518,8 +12518,6 @@ with pkgs;
 
   hushboard = python3.pkgs.callPackage ../applications/audio/hushboard { };
 
-  hydrogen = qt5.callPackage ../applications/audio/hydrogen { };
-
   hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { };
 
   jackline = callPackage ../applications/networking/instant-messengers/jackline {

From 282e9e2af8f8ecb8c37ba9bf0b8475e42aeda7a3 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 18 Jul 2025 08:29:47 -0500
Subject: [PATCH 2/2] hydrogen: refactor package definitions and meta section &
 finalAttrs

---
 pkgs/by-name/hy/hydrogen/package.nix | 56 ++++++++++++++--------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/pkgs/by-name/hy/hydrogen/package.nix b/pkgs/by-name/hy/hydrogen/package.nix
index 6d81b7cc4a6d..89b2f022f093 100644
--- a/pkgs/by-name/hy/hydrogen/package.nix
+++ b/pkgs/by-name/hy/hydrogen/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
   alsa-lib,
   ladspa-sdk,
   lash,
@@ -14,51 +13,52 @@
   libpulseaudio,
   libsndfile,
   lrdf,
-  qtbase,
-  qttools,
-  qtxmlpatterns,
+  qt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "hydrogen";
   version = "1.2.4";
 
   src = fetchFromGitHub {
     owner = "hydrogen-music";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-OMd8t043JVfMEfRjLdcE/R/4ymGp2yennkCjyX75r8Q=";
+    repo = "hydrogen";
+    tag = finalAttrs.version;
+    hash = "sha256-OMd8t043JVfMEfRjLdcE/R/4ymGp2yennkCjyX75r8Q=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
-  ];
-  buildInputs = [
-    alsa-lib
-    ladspa-sdk
-    lash
-    libarchive
-    libjack2
-    liblo
-    libpulseaudio
-    libsndfile
-    lrdf
-    qtbase
-    qttools
-    qtxmlpatterns
+    qt5.wrapQtAppsHook
   ];
+  buildInputs =
+    [
+      alsa-lib
+      ladspa-sdk
+      lash
+      libarchive
+      libjack2
+      liblo
+      libpulseaudio
+      libsndfile
+      lrdf
+    ]
+    ++ (with qt5; [
+      qtbase
+      qttools
+      qtxmlpatterns
+    ]);
 
   cmakeFlags = [
     "-DWANT_DEBUG=OFF"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Advanced drum machine";
     homepage = "http://www.hydrogen-music.org";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ orivej ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ orivej ];
   };
-}
+})