diff options
| author | Guillaume Girol <symphorien@users.noreply.github.com> | 2022-06-28 19:56:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-28 19:56:14 +0000 |
| commit | 32c523914fdb8bf9cc7912b1eba023a8daaae2e8 (patch) | |
| tree | 01f187c2da1d4d412065cce6831d8455588190dc | |
| parent | 65958f1b046b0f8374994025d508f286f9516c08 (diff) | |
| parent | 03dc0e6989d54bd32a4b8819b58f5e925dd43f27 (diff) | |
| download | nixpkgs-32c523914fdb8bf9cc7912b1eba023a8daaae2e8.tar nixpkgs-32c523914fdb8bf9cc7912b1eba023a8daaae2e8.tar.gz nixpkgs-32c523914fdb8bf9cc7912b1eba023a8daaae2e8.tar.bz2 nixpkgs-32c523914fdb8bf9cc7912b1eba023a8daaae2e8.tar.lz nixpkgs-32c523914fdb8bf9cc7912b1eba023a8daaae2e8.tar.xz nixpkgs-32c523914fdb8bf9cc7912b1eba023a8daaae2e8.tar.zst nixpkgs-32c523914fdb8bf9cc7912b1eba023a8daaae2e8.zip | |
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
| -rw-r--r-- | pkgs/development/libraries/jellyfin-ffmpeg/default.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index f95fdaacf8c..0f07c472c30 100644 --- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -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"; - 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 = '' @@ -19,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"; |