feat(jellyfin): setup packages correctly with flake
All checks were successful
Discord / discord commits (push) Has been skipped
All checks were successful
Discord / discord commits (push) Has been skipped
This commit is contained in:
parent
cefaec73be
commit
4f473a4248
|
@ -24,7 +24,8 @@ in {
|
||||||
optionalGroup mainUser
|
optionalGroup mainUser
|
||||||
++ optionalGroup "input"
|
++ optionalGroup "input"
|
||||||
++ optionalGroup "media"
|
++ optionalGroup "media"
|
||||||
++ optionalGroup "render";
|
++ optionalGroup "render"
|
||||||
|
++ optionalGroup "video";
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
jellyfin = {
|
jellyfin = {
|
||||||
|
@ -110,8 +111,7 @@ in {
|
||||||
"vp9"
|
"vp9"
|
||||||
"av1"
|
"av1"
|
||||||
];
|
];
|
||||||
allowHevcEncoding = true;
|
allowHevcEncoding = false;
|
||||||
allowAv1Encoding = true;
|
|
||||||
enableThrottling = false;
|
enableThrottling = false;
|
||||||
enableTonemapping = true;
|
enableTonemapping = true;
|
||||||
downMixAudioBoost = 1;
|
downMixAudioBoost = 1;
|
||||||
|
|
|
@ -6,28 +6,18 @@
|
||||||
}: let
|
}: let
|
||||||
jellyPkgs =
|
jellyPkgs =
|
||||||
if config.nvidia.enableCUDA
|
if config.nvidia.enableCUDA
|
||||||
then jellyfin-flake.packages.${pkgs.system}.cudaPackages // {inherit (pkgs.cudaPackages.pkgs) jellyfin-ffmpeg;}
|
then jellyfin-flake.packages.${pkgs.system}.cudaPackages
|
||||||
else jellyfin-flake.packages.${pkgs.system} // {inherit (pkgs) jellyfin-ffmpeg;};
|
else jellyfin-flake.packages.${pkgs.system};
|
||||||
|
|
||||||
jellyWeb = jellyPkgs.jellyfin-web.overrideAttrs (_: o: {
|
|
||||||
# TODO: Inject skip intro button for 10.9.0
|
|
||||||
});
|
|
||||||
|
|
||||||
jellyfinPkg = jellyPkgs.jellyfin.overrideAttrs (_: o: {
|
|
||||||
# This was the only way I found to replace the jellyfin-web package
|
|
||||||
preInstall = ''
|
|
||||||
makeWrapperArgs+=(
|
|
||||||
--add-flags "--ffmpeg ${jellyPkgs.jellyfin-ffmpeg}/bin/ffmpeg"
|
|
||||||
--add-flags "--webdir ${jellyWeb}/share/jellyfin-web"
|
|
||||||
)
|
|
||||||
'';
|
|
||||||
});
|
|
||||||
in {
|
in {
|
||||||
services.jellyfin.package = jellyfinPkg;
|
services.jellyfin = {
|
||||||
|
package = jellyPkgs.jellyfin;
|
||||||
|
webPackage = jellyPkgs.jellyfin-web;
|
||||||
|
ffmpegPackage = jellyPkgs.jellyfin-ffmpeg;
|
||||||
|
};
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = with config.services.jellyfin; [
|
||||||
jellyfinPkg
|
finalPackage
|
||||||
jellyWeb
|
webPackage
|
||||||
jellyPkgs.jellyfin-ffmpeg
|
ffmpegPackage
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
24
flake.lock
24
flake.lock
|
@ -760,8 +760,26 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"jellyfin-ffmpeg-src": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1714081542,
|
||||||
|
"narHash": "sha256-jy5LPurjuSIMZlzVZcuaqAwAZunbYc9/6aJf+hna0Kw=",
|
||||||
|
"owner": "jellyfin",
|
||||||
|
"repo": "jellyfin-ffmpeg",
|
||||||
|
"rev": "38aaefefec762dd185b631298752d489dcf084fe",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "jellyfin",
|
||||||
|
"ref": "v6.0.1-6",
|
||||||
|
"repo": "jellyfin-ffmpeg",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"jellyfin-flake": {
|
"jellyfin-flake": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"jellyfin-ffmpeg-src": "jellyfin-ffmpeg-src",
|
||||||
"jellyfin-src": "jellyfin-src",
|
"jellyfin-src": "jellyfin-src",
|
||||||
"jellyfin-web-src": "jellyfin-web-src",
|
"jellyfin-web-src": "jellyfin-web-src",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
@ -769,11 +787,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715574112,
|
"lastModified": 1715653242,
|
||||||
"narHash": "sha256-UrvwGrZqWkHUd3y3RWap8T9pcoEidPvTNl59F9aYMEI=",
|
"narHash": "sha256-/1scM1+8PoM90oVUva8voiuzPCNUr69aCn+jgKznPI8=",
|
||||||
"owner": "matt1432",
|
"owner": "matt1432",
|
||||||
"repo": "nixos-jellyfin",
|
"repo": "nixos-jellyfin",
|
||||||
"rev": "37600c9569edf09f6f1e984f662973fa4f625998",
|
"rev": "debe824dd69d98dc63e0f9ca434411cd10516848",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
Loading…
Reference in a new issue