mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-08 21:24:03 +00:00
Merge pull request #308845 from K900/fix-jellyfin-ffmpeg
jellyfin-ffmpeg: update, fix build
This commit is contained in:
commit
d716a0aa2b
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user