ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-23 05:37:27 +03:00
Code Issues Projects Releases Wiki Activity

jellyfin: move to pkgs/by-name

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/servers/jellyfin/nuget-deps.nix → pkgs/by-name/je/jellyfin/nuget-deps.nix
View File

7
pkgs/servers/jellyfin/default.nix → pkgs/by-name/je/jellyfin/package.nix
View File

@ -2,10 +2,9 @@
lib, lib,
fetchFromGitHub, fetchFromGitHub,
nixosTests, nixosTests,
stdenv,
dotnetCorePackages, dotnetCorePackages,
buildDotnetModule, buildDotnetModule,
ffmpeg, jellyfin-ffmpeg,
fontconfig, fontconfig,
freetype, freetype,
jellyfin-web, jellyfin-web,
@ -29,7 +28,7 @@ buildDotnetModule rec {
executables = [ "jellyfin" ]; executables = [ "jellyfin" ];
nugetDeps = ./nuget-deps.nix; nugetDeps = ./nuget-deps.nix;
runtimeDeps = [ runtimeDeps = [
ffmpeg jellyfin-ffmpeg
fontconfig fontconfig
freetype freetype
]; ];
@ -39,7 +38,7 @@ buildDotnetModule rec {
preInstall = '' preInstall = ''
makeWrapperArgs+=( makeWrapperArgs+=(
--add-flags "--ffmpeg ${ffmpeg}/bin/ffmpeg" --add-flags "--ffmpeg ${jellyfin-ffmpeg}/bin/ffmpeg"
--add-flags "--webdir ${jellyfin-web}/share/jellyfin-web" --add-flags "--webdir ${jellyfin-web}/share/jellyfin-web"
) )
''; '';

0
pkgs/servers/jellyfin/update.sh → pkgs/by-name/je/jellyfin/update.sh
View File

4
pkgs/top-level/all-packages.nix
View File

@ -5553,10 +5553,6 @@ with pkgs;
jellycli = callPackage ../applications/audio/jellycli { }; jellycli = callPackage ../applications/audio/jellycli { };
jellyfin = callPackage ../servers/jellyfin {
ffmpeg = jellyfin-ffmpeg;
};
jellyfin-ffmpeg = callPackage ../development/libraries/jellyfin-ffmpeg { }; jellyfin-ffmpeg = callPackage ../development/libraries/jellyfin-ffmpeg { };
jellyfin-media-player = libsForQt5.callPackage ../applications/video/jellyfin-media-player { jellyfin-media-player = libsForQt5.callPackage ../applications/video/jellyfin-media-player {