gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #239467 from justinas/jellyfin-ffmpeg-6

Browse Source 
jellyfin-ffmpeg: 5.1.2-8 -> 6.0-4, nv-codec-headers-12: init at 12.0.16.0
This commit is contained in:
Sandro
2023-07-23 17:58:20 +02:00
committed by GitHub
parent 013bd90760 fb480f51e8
commit 87e7748057
3 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/jellyfin-ffmpeg/default.nix
+6 -6
View File
@@ -1,21 +1,21 @@
{ ffmpeg_5-full
, nv-codec-headers-11
{ ffmpeg_6-full
, nv-codec-headers-12
, chromaprint
, fetchFromGitHub
, lib
}:
(ffmpeg_5-full.override {
nv-codec-headers = nv-codec-headers-11;
(ffmpeg_6-full.override {
nv-codec-headers-11 = nv-codec-headers-12;
}).overrideAttrs (old: rec {
pname = "jellyfin-ffmpeg";
version = "5.1.2-8";
version = "6.0-4";
src = fetchFromGitHub {
owner = "jellyfin";
repo = "jellyfin-ffmpeg";
rev = "v${version}";
sha256 = "sha256-0ne9Xj9MnB5WOkPRtPX7W30qG1osHd0tyua+5RMrnQc=";
sha256 = "sha256-o0D/GWbSoy5onbYG29wTbpZ8z4sZ2s1WclGCXRMSekA=";
};
buildInputs = old.buildInputs ++ [ chromaprint ];
pkgs/development/libraries/nv-codec-headers/12_x.nix
+27
View File
@@ -0,0 +1,27 @@
{ stdenv
, lib
, fetchgit
}:
stdenv.mkDerivation rec {
pname = "nv-codec-headers";
version = "12.0.16.0";
src = fetchgit {
url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git";
rev = "n${version}";
sha256 = "sha256-8YZU9pb0kzat0JBVEotaZUkNicQvLNIrIyPU9KTTjwg=";
};
makeFlags = [
"PREFIX=$(out)"
];
meta = with lib; {
description = "FFmpeg version of headers for NVENC";
homepage = "https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git";
license = licenses.mit;
maintainers = with maintainers; [ MP2E ];
platforms = platforms.all;
};
}
pkgs/top-level/all-packages.nix
+1
View File
@@ -23841,6 +23841,7 @@ with pkgs;
nv-codec-headers = callPackage ../development/libraries/nv-codec-headers { };
nv-codec-headers-10 = callPackage ../development/libraries/nv-codec-headers/10_x.nix { };
nv-codec-headers-11 = callPackage ../development/libraries/nv-codec-headers/11_x.nix { };
nv-codec-headers-12 = callPackage ../development/libraries/nv-codec-headers/12_x.nix { };
mkNvidiaContainerPkg = { name, containerRuntimePath, configTemplate, additionalPaths ? [] }:
let