parent
71066fad02
commit
6942e77ed3
3 changed files with 35 additions and 26 deletions
|
@ -1,15 +1,13 @@
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
jellyfin-overlays,
|
jellyfin-flake,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
overlays = jellyfin-overlays.legacyPackages.${pkgs.system};
|
|
||||||
|
|
||||||
jellyPkgs =
|
jellyPkgs =
|
||||||
if config.nvidia.enableCUDA
|
if config.nvidia.enableCUDA
|
||||||
then overlays.cudaPackages.pkgs
|
then jellyfin-flake.packages.${pkgs.system}.cudaPackages // {inherit (pkgs.cudaPackages.pkgs) jellyfin-ffmpeg;}
|
||||||
else overlays;
|
else jellyfin-flake.packages.${pkgs.system} // {inherit (pkgs) jellyfin-ffmpeg;};
|
||||||
|
|
||||||
jellyWeb = jellyPkgs.jellyfin-web.overrideAttrs (_: o: {
|
jellyWeb = jellyPkgs.jellyfin-web.overrideAttrs (_: o: {
|
||||||
# TODO: Inject skip intro button for 10.9.0
|
# TODO: Inject skip intro button for 10.9.0
|
||||||
|
|
45
flake.lock
generated
45
flake.lock
generated
|
@ -762,16 +762,18 @@
|
||||||
},
|
},
|
||||||
"jellyfin-flake": {
|
"jellyfin-flake": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"jellyfin-src": "jellyfin-src",
|
||||||
|
"jellyfin-web-src": "jellyfin-web-src",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1709785905,
|
"lastModified": 1715565229,
|
||||||
"narHash": "sha256-RUI/to18Mx76ocQmmKAlrbRSN+/sewNt+fdp9iDYWGM=",
|
"narHash": "sha256-WwdEBaANjwcnnSDuz/upMjMbwUfRUxz6uf9Tf5ZP4QI=",
|
||||||
"owner": "matt1432",
|
"owner": "matt1432",
|
||||||
"repo": "nixos-jellyfin",
|
"repo": "nixos-jellyfin",
|
||||||
"rev": "50274dcec43e2179d6cbf1e045eea5354e6af606",
|
"rev": "e8b4b977bcd667d833b1d19dfe0df0d1993cedf9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -780,19 +782,20 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"jellyfin-overlays": {
|
"jellyfin-src": {
|
||||||
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715515598,
|
"lastModified": 1715559024,
|
||||||
"narHash": "sha256-nYm7AZUBa9iE1uLto4EXroxXFdV1bNGRywHTih2fOtY=",
|
"narHash": "sha256-ZvXz4gnpYE9bMvOHbmLhqJLUomPmk1K9ysw+Wlsyhr4=",
|
||||||
"owner": "minijackson",
|
"owner": "jellyfin",
|
||||||
"repo": "nixpkgs",
|
"repo": "jellyfin",
|
||||||
"rev": "22e41692a4e9991413b4cf562f52b0c676a9a0ee",
|
"rev": "717afcdc8237e12607b68d8a05c2438388e958bf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "minijackson",
|
"owner": "jellyfin",
|
||||||
"ref": "jellyfin-10.9.0",
|
"ref": "v10.9.1",
|
||||||
"repo": "nixpkgs",
|
"repo": "jellyfin",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -812,6 +815,23 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"jellyfin-web-src": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1715559027,
|
||||||
|
"narHash": "sha256-KkPZ8OvGN/0gdoSVh9q0qEilae3tccgHRQQvrTsvycA=",
|
||||||
|
"owner": "jellyfin",
|
||||||
|
"repo": "jellyfin-web",
|
||||||
|
"rev": "ac8c2239ca7258e006f2acdb7acb02749a6ec824",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "jellyfin",
|
||||||
|
"ref": "v10.9.1",
|
||||||
|
"repo": "jellyfin-web",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"lib-aggregate": {
|
"lib-aggregate": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_2",
|
"flake-utils": "flake-utils_2",
|
||||||
|
@ -1734,7 +1754,6 @@
|
||||||
"hypridle": "hypridle",
|
"hypridle": "hypridle",
|
||||||
"hyprland": "hyprland",
|
"hyprland": "hyprland",
|
||||||
"jellyfin-flake": "jellyfin-flake",
|
"jellyfin-flake": "jellyfin-flake",
|
||||||
"jellyfin-overlays": "jellyfin-overlays",
|
|
||||||
"jellyfin-ultrachromic-src": "jellyfin-ultrachromic-src",
|
"jellyfin-ultrachromic-src": "jellyfin-ultrachromic-src",
|
||||||
"libratbag-src": "libratbag-src",
|
"libratbag-src": "libratbag-src",
|
||||||
"modernx-src": "modernx-src",
|
"modernx-src": "modernx-src",
|
||||||
|
|
|
@ -241,14 +241,6 @@
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
# FIXME: remove this when it reaches nixpkgs
|
|
||||||
jellyfin-overlays = {
|
|
||||||
type = "github";
|
|
||||||
owner = "minijackson";
|
|
||||||
repo = "nixpkgs";
|
|
||||||
ref = "jellyfin-10.9.0";
|
|
||||||
};
|
|
||||||
|
|
||||||
subsync = {
|
subsync = {
|
||||||
type = "github";
|
type = "github";
|
||||||
owner = "matt1432";
|
owner = "matt1432";
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue