Commit 66afe6ce authored by Atemu's avatar Atemu
Browse files

ffmpeg: use drv version for aribcaption configureFlags logic 

`withAribcaption` would be true because, for the flags in the function argument,
ffmpeg_6-full's version is the deciding one. We will likely need a better
pattern here.

Fixes https://github.com/NixOS/nixpkgs/issues/280645
parent 221ad6d7

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")