mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 01:13:05 +00:00
parent
dc4fb090d9
commit
3dc7789652
@ -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"
|
||||
)
|
||||
'';
|
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user