diff options
| author | Robert Schütz <dev@schuetz-co.de> | 2021-05-01 16:10:26 +0200 |
|---|---|---|
| committer | Robert Schütz <dev@schuetz-co.de> | 2021-05-01 16:10:26 +0200 |
| commit | 6ba83717fed92b708edf25a2165fe7b57bebf369 (patch) | |
| tree | c25919c0429a823b01911e761b4be66ec9f527bb /pkgs/development/libraries/qt-5 | |
| parent | 6de7e0d758ba82666df17ffa2335298ad5b064e4 (diff) | |
| download | nixpkgs-6ba83717fed92b708edf25a2165fe7b57bebf369.tar nixpkgs-6ba83717fed92b708edf25a2165fe7b57bebf369.tar.gz nixpkgs-6ba83717fed92b708edf25a2165fe7b57bebf369.tar.bz2 nixpkgs-6ba83717fed92b708edf25a2165fe7b57bebf369.tar.lz nixpkgs-6ba83717fed92b708edf25a2165fe7b57bebf369.tar.xz nixpkgs-6ba83717fed92b708edf25a2165fe7b57bebf369.tar.zst nixpkgs-6ba83717fed92b708edf25a2165fe7b57bebf369.zip | |
libsForQt5.qtwebengine: always use system ffmpeg
Diffstat (limited to 'pkgs/development/libraries/qt-5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 032fd1c4fb3..571c17dc4cf 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -140,9 +140,8 @@ qtModule { fi ''; - qmakeFlags = if stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64 - then [ "--" "-system-ffmpeg" ] ++ optional enableProprietaryCodecs "-proprietary-codecs" - else optional enableProprietaryCodecs "-- -proprietary-codecs"; + qmakeFlags = [ "--" "-system-ffmpeg" ] + ++ optional enableProprietaryCodecs "-proprietary-codecs"; propagatedBuildInputs = [ # Image formats @@ -158,7 +157,6 @@ qtModule { harfbuzz icu libevent - ] ++ optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ ffmpeg ] ++ optionals (!stdenv.isDarwin) [ dbus zlib minizip snappy nss protobuf jsoncpp |