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 f4fda4ad4d6b..ecf1c6bda792 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 4b2ebbe08be3..6dfa48ba56ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5553,10 +5553,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 {