alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #120646 from dotlambda/qtwebengine-ffmpeg

Browse source 
libsForQt5.qtwebengine: use ffmpeg instead of ffmpeg_3
This commit is contained in:
Luke Granger-Brown 2021-05-06 12:57:17 +01:00 committed by GitHub
parent bda9e192dd 6ba83717fe
commit b418e17a4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
View file

@ -15,7 +15,7 @@
, enableProprietaryCodecs ? true , enableProprietaryCodecs ? true
, gn , gn
, cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin , cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin
, ffmpeg_3 ? null , ffmpeg ? null
, lib, stdenv, fetchpatch , lib, stdenv, fetchpatch
, version ? null , version ? null
, qtCompatVersion , qtCompatVersion
@ -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,8 +157,7 @@ qtModule {
harfbuzz icu harfbuzz icu
libevent libevent
] ++ optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ ffmpeg
ffmpeg_3
] ++ optionals (!stdenv.isDarwin) [ ] ++ optionals (!stdenv.isDarwin) [
dbus zlib minizip snappy nss protobuf jsoncpp dbus zlib minizip snappy nss protobuf jsoncpp