cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #280784 from Atemu/fix/jellyfin-ffmpeg

Browse source 
ffmpeg: use drv version for aribcaption configureFlags logic
This commit is contained in:
Atemu 2024-01-14 11:13:33 +01:00 committed by GitHub
commit 836a47d2c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/ffmpeg/generic.nix
View file

@ -447,7 +447,7 @@ stdenv.mkDerivation (finalAttrs: {
*/
(enableFeature withAlsa "alsa")
# FIXME: see if jellyfin-ffmpeg is already on a version >= 6.1 to use enableFeature
(optionalString withAribcaption "--enable-libaribcaption")
(optionalString (withAribcaption && lib.versionAtLeast finalAttrs.version "6.1") "--enable-libaribcaption")
(enableFeature withBzlib "bzlib")
(enableFeature withCelt "libcelt")
(enableFeature withCuda "cuda")