From 13cddab9f3719e51509c2b1c3433bbd9537fc4ee Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 12 Jul 2025 12:07:50 -0500
Subject: [PATCH] haruna: migrate to by-name

haruna: fix rebuild on linux
---
 .../ha/haruna/package.nix}                    | 56 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 21 insertions(+), 37 deletions(-)
 rename pkgs/{applications/video/haruna/default.nix => by-name/ha/haruna/package.nix} (62%)

diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/by-name/ha/haruna/package.nix
similarity index 62%
rename from pkgs/applications/video/haruna/default.nix
rename to pkgs/by-name/ha/haruna/package.nix
index 4d4fbee44a14..220d54c80a8c 100644
--- a/pkgs/applications/video/haruna/default.nix
+++ b/pkgs/by-name/ha/haruna/package.nix
@@ -2,25 +2,11 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  breeze-icons,
-  breeze,
   cmake,
-  extra-cmake-modules,
   ffmpeg-headless,
-  kconfig,
-  kcoreaddons,
-  kfilemetadata,
-  ki18n,
-  kiconthemes,
-  kio,
-  kirigami,
-  kxmlgui,
-  kdoctools,
-  mpvqt,
+  kdePackages,
   pkg-config,
-  wrapQtAppsHook,
-  qqc2-desktop-style,
-  qtbase,
+  qt6,
   yt-dlp,
 }:
 
@@ -42,36 +28,36 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    breeze-icons
-    breeze
-    qqc2-desktop-style
+    kdePackages.breeze-icons
+    kdePackages.breeze
+    kdePackages.qqc2-desktop-style
     yt-dlp
 
     ffmpeg-headless
-    kconfig
-    kcoreaddons
-    kfilemetadata
-    ki18n
-    kiconthemes
-    kio
-    kirigami
-    kxmlgui
-    kdoctools
-    mpvqt
-    qtbase
+    kdePackages.kconfig
+    kdePackages.kcoreaddons
+    kdePackages.kfilemetadata
+    kdePackages.ki18n
+    kdePackages.kiconthemes
+    kdePackages.kio
+    kdePackages.kirigami
+    kdePackages.kxmlgui
+    kdePackages.kdoctools
+    kdePackages.mpvqt
+    qt6.qtbase
   ];
 
   nativeBuildInputs = [
     cmake
-    extra-cmake-modules
+    kdePackages.extra-cmake-modules
     pkg-config
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://invent.kde.org/multimedia/haruna";
     description = "Open source video player built with Qt/QML and libmpv";
-    license = with licenses; [
+    license = with lib.licenses; [
       bsd3
       cc-by-40
       cc-by-sa-40
@@ -80,7 +66,7 @@ stdenv.mkDerivation rec {
       gpl3Plus
       wtfpl
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       jojosch
       kashw2
     ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec37fae6958d..3ff765bfc843 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12121,8 +12121,6 @@ with pkgs;
     };
   };
 
-  haruna = kdePackages.callPackage ../applications/video/haruna { };
-
   input-leap = qt6Packages.callPackage ../applications/misc/input-leap {
     avahi = avahi.override { withLibdnssdCompat = true; };
   };