public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #45122 from Thra11/qtwebengine-aarch64

Browse Source 
qtwebengine: Use system ffmpeg on aarch64
This commit is contained in:
Thomas Tuegel 2018-08-25 07:20:05 -05:00 committed by GitHub
commit b74dc6f0f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
View File

@ -13,6 +13,7 @@
, systemd , systemd
, enableProprietaryCodecs ? true , enableProprietaryCodecs ? true
, gn, darwin, openbsm , gn, darwin, openbsm
, ffmpeg ? null
, lib, stdenv # lib.optional, needsPax , lib, stdenv # lib.optional, needsPax
}: }:
@ -115,7 +116,9 @@ EOF
fi fi
''; '';
qmakeFlags = optional enableProprietaryCodecs "-- -proprietary-codecs"; qmakeFlags = if stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64
then [ "--" "-system-ffmpeg" ] ++ optional enableProprietaryCodecs "-proprietary-codecs"
else optional enableProprietaryCodecs "-- -proprietary-codecs";
propagatedBuildInputs = [ propagatedBuildInputs = [
# Image formats # Image formats
@ -131,6 +134,8 @@ EOF
harfbuzz icu harfbuzz icu
libevent libevent
] ++ optionals stdenv.hostPlatform.isArm [
ffmpeg
] ++ optionals (!stdenv.isDarwin) [ ] ++ optionals (!stdenv.isDarwin) [
dbus zlib minizip snappy nss protobuf jsoncpp dbus zlib minizip snappy nss protobuf jsoncpp