From 66afe6cefc3909b0a6a4b78ab47e8908507d4886 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 13 Jan 2024 19:30:01 +0100 Subject: [PATCH] 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 --- pkgs/development/libraries/ffmpeg/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 8b810120b80b..512ec3a4bf16 100644 --- 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")