From e01c61347e5f5ab030f907a2aaf38d593765b754 Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Wed, 15 Aug 2018 17:38:47 +0100 Subject: [PATCH] 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. --- pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index dc5f2ae96b3e..757d5b662e28 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -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