libsForQt5.qtwebengine: always use system ffmpeg

This commit is contained in:
Robert Schütz 2021-05-01 16:10:26 +02:00
parent 6de7e0d758
commit 6ba83717fe

View file

@ -140,9 +140,8 @@ qtModule {
fi fi
''; '';
qmakeFlags = if stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64 qmakeFlags = [ "--" "-system-ffmpeg" ]
then [ "--" "-system-ffmpeg" ] ++ optional enableProprietaryCodecs "-proprietary-codecs" ++ optional enableProprietaryCodecs "-proprietary-codecs";
else optional enableProprietaryCodecs "-- -proprietary-codecs";
propagatedBuildInputs = [ propagatedBuildInputs = [
# Image formats # Image formats
@ -158,7 +157,6 @@ qtModule {
harfbuzz icu harfbuzz icu
libevent libevent
] ++ optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [
ffmpeg ffmpeg
] ++ optionals (!stdenv.isDarwin) [ ] ++ optionals (!stdenv.isDarwin) [
dbus zlib minizip snappy nss protobuf jsoncpp dbus zlib minizip snappy nss protobuf jsoncpp