Merge pull request #120646 from dotlambda/qtwebengine-ffmpeg

libsForQt5.qtwebengine: use ffmpeg instead of ffmpeg_3

Changed files
+4 -6
pkgs
development
libraries
qt-5
modules
+4 -6
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
···
, enableProprietaryCodecs ? true
, gn
, cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin
-
, ffmpeg_3 ? null
+
, ffmpeg ? null
, lib, stdenv, fetchpatch
, version ? null
, qtCompatVersion
···
fi
'';
-
qmakeFlags = if stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64
-
then [ "--" "-system-ffmpeg" ] ++ optional enableProprietaryCodecs "-proprietary-codecs"
-
else optional enableProprietaryCodecs "-- -proprietary-codecs";
+
qmakeFlags = [ "--" "-system-ffmpeg" ]
+
++ optional enableProprietaryCodecs "-proprietary-codecs";
propagatedBuildInputs = [
# Image formats
···
harfbuzz icu
libevent
-
] ++ optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [
-
ffmpeg_3
+
ffmpeg
] ++ optionals (!stdenv.isDarwin) [
dbus zlib minizip snappy nss protobuf jsoncpp