diff options
| author | Luke Granger-Brown <git@lukegb.com> | 2021-05-06 12:57:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-06 12:57:17 +0100 |
| commit | b418e17a4ccf42b1a99aa6eca2b86a5b552d081a (patch) | |
| tree | 8927a0adf698f24719637fa7e3b5e91b6cca0c02 /pkgs | |
| parent | bda9e192ddcf998667379883d38445c80e576830 (diff) | |
| parent | 6ba83717fed92b708edf25a2165fe7b57bebf369 (diff) | |
| download | nixpkgs-b418e17a4ccf42b1a99aa6eca2b86a5b552d081a.tar nixpkgs-b418e17a4ccf42b1a99aa6eca2b86a5b552d081a.tar.gz nixpkgs-b418e17a4ccf42b1a99aa6eca2b86a5b552d081a.tar.bz2 nixpkgs-b418e17a4ccf42b1a99aa6eca2b86a5b552d081a.tar.lz nixpkgs-b418e17a4ccf42b1a99aa6eca2b86a5b552d081a.tar.xz nixpkgs-b418e17a4ccf42b1a99aa6eca2b86a5b552d081a.tar.zst nixpkgs-b418e17a4ccf42b1a99aa6eca2b86a5b552d081a.zip | |
Merge pull request #120646 from dotlambda/qtwebengine-ffmpeg
libsForQt5.qtwebengine: use ffmpeg instead of ffmpeg_3
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index e2ca47f45f2..571c17dc4cf 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -15,7 +15,7 @@ , enableProprietaryCodecs ? true , gn , cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin -, ffmpeg_3 ? null +, ffmpeg ? null , lib, stdenv, fetchpatch , version ? null , qtCompatVersion @@ -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,8 +157,7 @@ qtModule { harfbuzz icu libevent - ] ++ optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ - ffmpeg_3 + ffmpeg ] ++ optionals (!stdenv.isDarwin) [ dbus zlib minizip snappy nss protobuf jsoncpp |