From 3dc7789652a2a9db1b099e5c656d5d44eadbe1cc Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Mon, 10 Jun 2024 20:30:21 +0200
Subject: [PATCH] jellyfin: move to pkgs/by-name

(cherry picked from commit 2fa82b71c13a07bfc8ac5cf3aa1c4669dad71c1c)
---
 pkgs/{servers => by-name/je}/jellyfin/nuget-deps.nix       | 0
 .../default.nix => by-name/je/jellyfin/package.nix}        | 7 +++----
 pkgs/{servers => by-name/je}/jellyfin/update.sh            | 0
 pkgs/top-level/all-packages.nix                            | 4 ----
 4 files changed, 3 insertions(+), 8 deletions(-)
 rename pkgs/{servers => by-name/je}/jellyfin/nuget-deps.nix (100%)
 rename pkgs/{servers/jellyfin/default.nix => by-name/je/jellyfin/package.nix} (93%)
 rename pkgs/{servers => by-name/je}/jellyfin/update.sh (100%)

diff --git a/pkgs/servers/jellyfin/nuget-deps.nix b/pkgs/by-name/je/jellyfin/nuget-deps.nix
similarity index 100%
rename from pkgs/servers/jellyfin/nuget-deps.nix
rename to pkgs/by-name/je/jellyfin/nuget-deps.nix
diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/by-name/je/jellyfin/package.nix
similarity index 93%
rename from pkgs/servers/jellyfin/default.nix
rename to pkgs/by-name/je/jellyfin/package.nix
index f039fbe869e2..b4392dcfa431 100644
--- a/pkgs/servers/jellyfin/default.nix
+++ b/pkgs/by-name/je/jellyfin/package.nix
@@ -2,10 +2,9 @@
   lib,
   fetchFromGitHub,
   nixosTests,
-  stdenv,
   dotnetCorePackages,
   buildDotnetModule,
-  ffmpeg,
+  jellyfin-ffmpeg,
   fontconfig,
   freetype,
   jellyfin-web,
@@ -29,7 +28,7 @@ buildDotnetModule rec {
   executables = [ "jellyfin" ];
   nugetDeps = ./nuget-deps.nix;
   runtimeDeps = [
-    ffmpeg
+    jellyfin-ffmpeg
     fontconfig
     freetype
   ];
@@ -39,7 +38,7 @@ buildDotnetModule rec {
 
   preInstall = ''
     makeWrapperArgs+=(
-      --add-flags "--ffmpeg ${ffmpeg}/bin/ffmpeg"
+      --add-flags "--ffmpeg ${jellyfin-ffmpeg}/bin/ffmpeg"
       --add-flags "--webdir ${jellyfin-web}/share/jellyfin-web"
     )
   '';
diff --git a/pkgs/servers/jellyfin/update.sh b/pkgs/by-name/je/jellyfin/update.sh
similarity index 100%
rename from pkgs/servers/jellyfin/update.sh
rename to pkgs/by-name/je/jellyfin/update.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c755dc2976d..30150c862bd6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5561,10 +5561,6 @@ with pkgs;
 
   jellycli = callPackage ../applications/audio/jellycli { };
 
-  jellyfin = callPackage ../servers/jellyfin {
-    ffmpeg = jellyfin-ffmpeg;
-  };
-
   jellyfin-ffmpeg = callPackage ../development/libraries/jellyfin-ffmpeg { };
 
   jellyfin-media-player = libsForQt5.callPackage ../applications/video/jellyfin-media-player {