diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-01-25 00:02:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-25 00:02:13 +0000 |
| commit | bbbd0a92afb49fb7cbfe382e7db43417595b2fe3 (patch) | |
| tree | f518ba2546d68a1fb96a260143ef9831a6944fed /pkgs/development/libraries/ffmpeg/generic.nix | |
| parent | a45818989adb69966bbaa992b9b0d1c743d4726e (diff) | |
| parent | 1e643a385290e54947594ac241d4cf407348910c (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/ffmpeg/generic.nix')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 2382dd64bcb78..e3b0534d2af92 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -54,6 +54,8 @@ let ifMinVer = minVer: flag: if reqMin minVer then flag else null; + ifVerOlder = maxVer: flag: if (lib.versionOlder branch maxVer) then flag else null; + # Version specific fix verFix = withoutFix: fixVer: withFix: if reqMatch fixVer then withFix else withoutFix; @@ -121,7 +123,7 @@ stdenv.mkDerivation rec { (ifMinVer "0.6" "--enable-avdevice") "--enable-avfilter" (ifMinVer "0.6" "--enable-avformat") - (ifMinVer "1.0" "--enable-avresample") + (ifMinVer "1.0" (ifVerOlder "5.0" "--enable-avresample")) (ifMinVer "1.1" "--enable-avutil") "--enable-postproc" (ifMinVer "0.9" "--enable-swresample") |