diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
| commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
| tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg | |
| parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
| parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
| download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index 2637ababbdd7..73bbe1782b7f 100644 --- a/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -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 ]; |