Unverified Commit 836a47d2 authored by Atemu's avatar Atemu Committed by GitHub
Browse files

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

ffmpeg: use drv version for aribcaption configureFlags logic
parents 46cf5e9b 66afe6ce

pkgs/development/libraries/ffmpeg/generic.nix

+1 −1
Original line number Diff line number Diff line
@@ -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")