diff options
| author | K900 <me@0upti.me> | 2024-05-03 21:44:22 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-03 21:44:22 +0300 |
| commit | d716a0aa2bd0ee610308f4dbaa7ef938e8dc50e4 (patch) | |
| tree | df64ed73442f51b2c4aeeb51fb6488d22c78cba0 | |
| parent | 24b2b7386e47bfcc6cf05fd39f3fc2cfc97c1692 (diff) | |
| parent | 67825897a497e62676118a2f8728bf3e598199e8 (diff) | |
Merge pull request #308845 from K900/fix-jellyfin-ffmpeg
jellyfin-ffmpeg: update, fix build
| -rw-r--r-- | pkgs/development/libraries/jellyfin-ffmpeg/default.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index 1b2bd8a3e866e..4498a995a4d7a 100644 --- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -1,10 +1,11 @@ { ffmpeg_6-full , fetchFromGitHub +, fetchpatch , lib }: let - version = "6.0.1-5"; + version = "6.0.1-6"; in (ffmpeg_6-full.override { @@ -13,13 +14,19 @@ in owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - hash = "sha256-y/J4iBbqtyyMnTb6R3lTVSOQD8oPo8liyVA5GQ5BvmM="; + hash = "sha256-jy5LPurjuSIMZlzVZcuaqAwAZunbYc9/6aJf+hna0Kw="; }; }).overrideAttrs (old: { pname = "jellyfin-ffmpeg"; # Clobber upstream patches as they don't apply to the Jellyfin fork - patches = []; + patches = [ + (fetchpatch { + name = "fix_build_failure_due_to_libjxl_version_to_new"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/75b1a555a70c178a9166629e43ec2f6250219eb2"; + hash = "sha256-+2kzfPJf5piim+DqEgDuVEEX5HLwRsxq0dWONJ4ACrU="; + }) + ]; configureFlags = old.configureFlags ++ [ "--extra-version=Jellyfin" |