From ef1e28f5f6e603c3b031de97d28456c39cc1bb00 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 10 Apr 2017 02:27:17 +0300 Subject: [PATCH] qt56.qtwebengine: patch more library paths Backport 040b86a96e8cc5125762f2b026734e9c760caad9. --- .../qt-5/5.6/qtwebengine/default.nix | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix index 13b8296dc0e3..1234c825b14d 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix @@ -2,7 +2,8 @@ , xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst , fontconfig, freetype, harfbuzz, icu, dbus -, zlib, libjpeg, libpng, libtiff +, zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus +, jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent , alsaLib , libcap , pciutils @@ -11,7 +12,7 @@ , coreutils , pkgconfig, python2 -, stdenv # lib.optional, needsPax +, lib, stdenv # lib.optional, needsPax }: qtSubmodule { @@ -47,20 +48,33 @@ qtSubmodule { -docdir $out/share/doc/qt5" ''; propagatedBuildInputs = [ - dbus zlib alsaLib - # Image formats - libjpeg libpng libtiff + libjpeg libpng libtiff libwebp + + # Video formats + srtp libvpx + + # Audio formats + libopus # Text rendering - fontconfig freetype harfbuzz icu + harfbuzz icu + ] + ++ lib.optionals (!stdenv.isDarwin) [ + dbus zlib minizip snappy nss protobuf jsoncpp libevent + + # Audio formats + alsaLib + + # Text rendering + fontconfig freetype + + libcap + pciutils # X11 libs xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst xlibs.libXcomposite - - libcap - pciutils ]; patches = [ ./chromium-clang-update-py.patch