mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 23:36:17 +01:00
qtwebengine: Use system ffmpeg on aarch64
On aarch64, linking against the vendored ffmpeg fails. Including ffmpeg as a dependency and passing -system-ffmpeg to qmake fixes this. Slightly odd conditional in qmakeFlags to avoid altering the list on non-arm platforms, so that the change doesn't trigger an unneccessary rebuild.
This commit is contained in:
parent
be34fdfa89
commit
e01c61347e
1 changed files with 6 additions and 1 deletions
|
@ -13,6 +13,7 @@
|
|||
, systemd
|
||||
, enableProprietaryCodecs ? true
|
||||
, gn, darwin, openbsm
|
||||
, ffmpeg ? null
|
||||
, lib, stdenv # lib.optional, needsPax
|
||||
}:
|
||||
|
||||
|
@ -117,7 +118,9 @@ EOF
|
|||
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 = [
|
||||
# Image formats
|
||||
|
@ -133,6 +136,8 @@ EOF
|
|||
harfbuzz icu
|
||||
|
||||
libevent
|
||||
] ++ optionals stdenv.hostPlatform.isArm [
|
||||
ffmpeg
|
||||
] ++ optionals (!stdenv.isDarwin) [
|
||||
dbus zlib minizip snappy nss protobuf jsoncpp
|
||||
|
||||
|
|
Loading…
Reference in a new issue