diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-09-03 22:02:11 +0200 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@sap.com> | 2022-09-29 11:33:40 +0200 |
| commit | 77e8784f4efd776bdadb48ce69f3b29d867ae3b9 (patch) | |
| tree | 5b0e88e2928cafb03e2cb8f84e99405ae054f571 /pkgs/development/libraries/ffmpeg/generic.nix | |
| parent | 8609c5598f73208a6696a41d4139cab4716c165c (diff) | |
ffmpeg: remove 1.X conditions
Diffstat (limited to 'pkgs/development/libraries/ffmpeg/generic.nix')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index e6282993d3b73..a7086e12a4bcc 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -64,8 +64,7 @@ stdenv.mkDerivation rec { postPatch = "patchShebangs ."; inherit patches; - outputs = [ "bin" "dev" "out" "man" ] - ++ optional (reqMin "1.0") "doc" ; # just dev-doc + outputs = [ "bin" "dev" "out" "man" "doc" ]; setOutputFlags = false; # doesn't accept all and stores configureFlags in libs! configurePlatforms = []; @@ -103,8 +102,8 @@ stdenv.mkDerivation rec { "--enable-avdevice" "--enable-avfilter" "--enable-avformat" - (ifMinVer "1.0" (ifVerOlder "5.0" "--enable-avresample")) - (ifMinVer "1.1" "--enable-avutil") + (ifVerOlder "5.0" "--enable-avresample") + "--enable-avutil" "--enable-postproc" "--enable-swresample" "--enable-swscale" @@ -114,10 +113,10 @@ stdenv.mkDerivation rec { "--enable-libass" "--enable-bzlib" "--enable-gnutls" - (ifMinVer "1.0" "--enable-fontconfig") + "--enable-fontconfig" "--enable-libfreetype" "--enable-libmp3lame" - (ifMinVer "1.2" "--enable-iconv") + "--enable-iconv" "--enable-libtheora" (ifMinVer "2.1" "--enable-libssh") (enableFeature vaapiSupport "vaapi") @@ -131,7 +130,7 @@ stdenv.mkDerivation rec { (ifMinVer "4.2" (enableFeature libaomSupport "libaom")) (lib.optionalString pulseaudioSupport "--enable-libpulse") (ifMinVer "2.5" (if sdlSupport && reqMin "3.2" then "--enable-sdl2" else null)) - (ifMinVer "1.2" "--enable-libsoxr") + "--enable-libsoxr" "--enable-libx264" "--enable-libxvid" "--enable-libzimg" |