pyrox.dev
Merge pull request #120646 from dotlambda/qtwebengine-ffmpeg
libsForQt5.qtwebengine: use ffmpeg instead of ffmpeg_3
authored by Luke Granger-Brown and committed by GitHub b418e17a bda9e192
+4
-6
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+4
-6
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
···
15
15
, enableProprietaryCodecs ? true
16
16
, gn
17
17
, cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin
18
-
, ffmpeg_3 ? null
18
+
, ffmpeg ? null
19
19
, lib, stdenv, fetchpatch
20
20
, version ? null
21
21
, qtCompatVersion
···
140
140
fi
141
141
'';
142
142
143
-
qmakeFlags = if stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64
144
-
then [ "--" "-system-ffmpeg" ] ++ optional enableProprietaryCodecs "-proprietary-codecs"
145
-
else optional enableProprietaryCodecs "-- -proprietary-codecs";
143
+
qmakeFlags = [ "--" "-system-ffmpeg" ]
144
+
++ optional enableProprietaryCodecs "-proprietary-codecs";
146
145
147
146
propagatedBuildInputs = [
148
147
# Image formats
···
158
157
harfbuzz icu
159
158
160
159
libevent
161
-
] ++ optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [
162
-
ffmpeg_3
160
+
ffmpeg
163
161
] ++ optionals (!stdenv.isDarwin) [
164
162
dbus zlib minizip snappy nss protobuf jsoncpp
165
163