nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 11:53:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

ffmpeg: use drv version for aribcaption configureFlags logic

Browse Source 
`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
This commit is contained in:
Atemu 2024-01-13 19:30:01 +01:00
parent 221ad6d7ff
commit 66afe6cefc
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")