jellyfin: move to pkgs/by-name

This commit is contained in:
Minijackson 2024-06-10 20:30:21 +02:00
parent b71cba0165
commit 2fa82b71c1
No known key found for this signature in database
GPG Key ID: FEA888C9F5D64F62
4 changed files with 3 additions and 8 deletions

View File

@ -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"
)
'';

View File

@ -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 {