From 4861bef3c1c4b31dd0549b5c9d59ee6e8a4e05df Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 13:28:31 -0800 Subject: [PATCH] ffmpeg: restore 4.x as default Partial revert of 9236978d80a5f6ce96b7271476fad824ead7b93d Was causing too many failures for packages which don't yet support ffmpeg 5.x yet. --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32bb9c06d57f..3804bbe1b2b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16595,7 +16595,9 @@ with pkgs; ffmpeg_3 = ffmpeg_3_4; # Please make sure this is updated to the latest version on the next major # update to ffmpeg - ffmpeg = ffmpeg_5; + # Packages which use ffmpeg as a library, should pin to the relevant major + # version number which the upstream support. + ffmpeg = ffmpeg_4; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { svt-av1 = if stdenv.isAarch64 then null else svt-av1;