From 1d49c3218e82e32b959edad6df872d4531c7ec93 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 12 Jan 2026 18:52:25 -0600
Subject: [PATCH] jellyfin-desktop: migrate to by-name and switch to
 kdePackages Qt stack
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Move package to pkgs/by-name/je/jellyfin-desktop
- Replace direct Qt inputs with kdePackages.* equivalents
  (qtbase, qtdeclarative, qtwebchannel, qtwebengine, wrapQtAppsHook, mpvqt)
- Convert derivation to stdenv.mkDerivation (finalAttrs: { … }) style
- Use tag = "v${finalAttrs.version}" instead of rev
- Remove top-level jellyfin-desktop attribute; by-name exposes it automatically
- Preserve existing patch and build logic
---
 .../non-fatal-unique-app.patch                |  0
 .../je/jellyfin-desktop/package.nix}          | 25 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 10 insertions(+), 17 deletions(-)
 rename pkgs/{applications/video => by-name/je}/jellyfin-desktop/non-fatal-unique-app.patch (100%)
 rename pkgs/{applications/video/jellyfin-desktop/default.nix => by-name/je/jellyfin-desktop/package.nix} (86%)

diff --git a/pkgs/applications/video/jellyfin-desktop/non-fatal-unique-app.patch b/pkgs/by-name/je/jellyfin-desktop/non-fatal-unique-app.patch
similarity index 100%
rename from pkgs/applications/video/jellyfin-desktop/non-fatal-unique-app.patch
rename to pkgs/by-name/je/jellyfin-desktop/non-fatal-unique-app.patch
diff --git a/pkgs/applications/video/jellyfin-desktop/default.nix b/pkgs/by-name/je/jellyfin-desktop/package.nix
similarity index 86%
rename from pkgs/applications/video/jellyfin-desktop/default.nix
rename to pkgs/by-name/je/jellyfin-desktop/package.nix
index 12ac1682972f..0c62dc24ed2d 100644
--- a/pkgs/applications/video/jellyfin-desktop/default.nix
+++ b/pkgs/by-name/je/jellyfin-desktop/package.nix
@@ -5,27 +5,22 @@
   cmake,
   ninja,
   python3,
-  wrapQtAppsHook,
-  qtbase,
-  qtdeclarative,
-  qtwebchannel,
-  qtwebengine,
+  kdePackages,
   mpv-unwrapped,
-  mpvqt,
   libcec,
   SDL2,
   libxrandr,
   cacert,
   nix-update-script,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "jellyfin-desktop";
   version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin-desktop";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ITlYOrMS6COx9kDRSBi4wM6mzL/Q2G5X9GbABwDIOe4=";
     fetchSubmodules = true;
   };
@@ -36,15 +31,15 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     ninja
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
   ]
   ++ lib.optional stdenv.hostPlatform.isDarwin python3;
 
   buildInputs = [
-    qtbase
-    qtdeclarative
-    qtwebchannel
-    qtwebengine
+    kdePackages.qtbase
+    kdePackages.qtdeclarative
+    kdePackages.qtwebchannel
+    kdePackages.qtwebengine
     mpv-unwrapped
 
     # input sources
@@ -55,7 +50,7 @@ stdenv.mkDerivation rec {
     libxrandr
     cacert
   ]
-  ++ lib.optional (!stdenv.hostPlatform.isDarwin) mpvqt;
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) kdePackages.mpvqt;
 
   cmakeFlags = [
     "-DCHECK_FOR_UPDATES=OFF"
@@ -97,4 +92,4 @@ stdenv.mkDerivation rec {
     ];
     mainProgram = "jellyfin-desktop";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a786b2e13f0..d957c5d64fbe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1804,8 +1804,6 @@ with pkgs;
 
   intensity-normalization = with python3Packages; toPythonApplication intensity-normalization;
 
-  jellyfin-desktop = kdePackages.callPackage ../applications/video/jellyfin-desktop { };
-
   jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { };
 
   klaus = with python3Packages; toPythonApplication klaus;