Merge pull request #178276 from justinas/jellyfin-ffmpeg-nvcodec-headers-11

jellyfin-ffmpeg: 5.0.1-5 -> 5.0.1-6, bump nv-codec-headers to v11
This commit is contained in:
Guillaume Girol 2022-06-28 19:56:14 +00:00 committed by GitHub
commit 32c523914f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,14 +1,20 @@
{ ffmpeg_5, ffmpeg-full, fetchFromGitHub, lib }: { ffmpeg_5-full
, nv-codec-headers-11
, fetchFromGitHub
, lib
}:
(ffmpeg-full.override { ffmpeg = ffmpeg_5; }).overrideAttrs (old: rec { (ffmpeg_5-full.override {
nv-codec-headers = nv-codec-headers-11;
}).overrideAttrs (old: rec {
pname = "jellyfin-ffmpeg"; pname = "jellyfin-ffmpeg";
version = "5.0.1-5"; version = "5.0.1-7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jellyfin"; owner = "jellyfin";
repo = "jellyfin-ffmpeg"; repo = "jellyfin-ffmpeg";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-rFzBAniw2vQGFn2GDlz6NiB/Ow2EZlE3Lu+ceYTStkM="; sha256 = "sha256-jMd7tEEfiHqTp4q8c6EvbjL0KyJ6ucj4ZNrKOJLJ1Mc=";
}; };
postPatch = '' postPatch = ''
@ -19,8 +25,6 @@
${old.postPatch or ""} ${old.postPatch or ""}
''; '';
doCheck = false; # https://github.com/jellyfin/jellyfin-ffmpeg/issues/79
meta = with lib; { meta = with lib; {
description = "${old.meta.description} (Jellyfin fork)"; description = "${old.meta.description} (Jellyfin fork)";
homepage = "https://github.com/jellyfin/jellyfin-ffmpeg"; homepage = "https://github.com/jellyfin/jellyfin-ffmpeg";