qt56.qtwebengine: patch more library paths

Backport 040b86a96e.
This commit is contained in:
Nikolay Amiantov 2017-04-10 02:27:17 +03:00
parent f12bd6e9b6
commit ef1e28f5f6
1 changed files with 23 additions and 9 deletions

View File

@ -2,7 +2,8 @@
, xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst , xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst
, fontconfig, freetype, harfbuzz, icu, dbus , fontconfig, freetype, harfbuzz, icu, dbus
, zlib, libjpeg, libpng, libtiff , zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus
, jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent
, alsaLib , alsaLib
, libcap , libcap
, pciutils , pciutils
@ -11,7 +12,7 @@
, coreutils , coreutils
, pkgconfig, python2 , pkgconfig, python2
, stdenv # lib.optional, needsPax , lib, stdenv # lib.optional, needsPax
}: }:
qtSubmodule { qtSubmodule {
@ -47,20 +48,33 @@ qtSubmodule {
-docdir $out/share/doc/qt5" -docdir $out/share/doc/qt5"
''; '';
propagatedBuildInputs = [ propagatedBuildInputs = [
dbus zlib alsaLib
# Image formats # Image formats
libjpeg libpng libtiff libjpeg libpng libtiff libwebp
# Video formats
srtp libvpx
# Audio formats
libopus
# Text rendering # 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 # X11 libs
xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst
xlibs.libXcomposite xlibs.libXcomposite
libcap
pciutils
]; ];
patches = [ patches = [
./chromium-clang-update-py.patch ./chromium-clang-update-py.patch