From 91e73fa5e985fc913d4a69fbc54399995875892c Mon Sep 17 00:00:00 2001
From: Justinas Stankevicius <justinas@justinas.org>
Date: Sun, 19 Jun 2022 22:26:00 +0300
Subject: [PATCH 1/2] jellyfin-ffmpeg: bump nv-codec-headers to v11

Fixes nvenc on Jellyfin 10.8.0
---
 .../libraries/jellyfin-ffmpeg/default.nix            | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix
index f95fdaacf8c..da5ba039380 100644
--- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix
+++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix
@@ -1,6 +1,14 @@
-{ ffmpeg_5, ffmpeg-full, fetchFromGitHub, lib }:
+{ ffmpeg_5
+, ffmpeg-full
+, nv-codec-headers-11
+, fetchFromGitHub
+, lib
+}:
 
-(ffmpeg-full.override { ffmpeg = ffmpeg_5; }).overrideAttrs (old: rec {
+(ffmpeg-full.override {
+  ffmpeg = ffmpeg_5;
+  nv-codec-headers = nv-codec-headers-11;
+}).overrideAttrs (old: rec {
   pname = "jellyfin-ffmpeg";
   version = "5.0.1-5";
 

From 03dc0e6989d54bd32a4b8819b58f5e925dd43f27 Mon Sep 17 00:00:00 2001
From: Justinas Stankevicius <justinas@justinas.org>
Date: Tue, 21 Jun 2022 00:32:29 +0300
Subject: [PATCH 2/2] jellyfin-ffmpeg: 5.0.1-5 -> 5.0.1-7

Also:
* reenable tests
* simplify ffmpeg_5-full usage
---
 .../libraries/jellyfin-ffmpeg/default.nix            | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix
index da5ba039380..0f07c472c30 100644
--- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix
+++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix
@@ -1,22 +1,20 @@
-{ ffmpeg_5
-, ffmpeg-full
+{ ffmpeg_5-full
 , nv-codec-headers-11
 , fetchFromGitHub
 , lib
 }:
 
-(ffmpeg-full.override {
-  ffmpeg = ffmpeg_5;
+(ffmpeg_5-full.override {
   nv-codec-headers = nv-codec-headers-11;
 }).overrideAttrs (old: rec {
   pname = "jellyfin-ffmpeg";
-  version = "5.0.1-5";
+  version = "5.0.1-7";
 
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin-ffmpeg";
     rev = "v${version}";
-    sha256 = "sha256-rFzBAniw2vQGFn2GDlz6NiB/Ow2EZlE3Lu+ceYTStkM=";
+    sha256 = "sha256-jMd7tEEfiHqTp4q8c6EvbjL0KyJ6ucj4ZNrKOJLJ1Mc=";
   };
 
   postPatch = ''
@@ -27,8 +25,6 @@
     ${old.postPatch or ""}
   '';
 
-  doCheck = false; # https://github.com/jellyfin/jellyfin-ffmpeg/issues/79
-
   meta = with lib; {
     description = "${old.meta.description} (Jellyfin fork)";
     homepage = "https://github.com/jellyfin/jellyfin-ffmpeg";