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

ffmpeg: use drv version for aribcaption configureFlags logic
khaneliman · Jan 14, 2024 · 836a47d · 836a47d
2 parents 46cf5e9 + 66afe6c
commit 836a47d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -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")