Skip to content

Commit

Permalink
qt5.qtwebengine: use system libraries where possible
Browse files Browse the repository at this point in the history
Fixes #23987.

(cherry picked from commit 040b86a)
  • Loading branch information
abbradar committed Mar 23, 2017
1 parent 15fdfa9 commit d5bd98e
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
Expand Up @@ -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
Expand Down Expand Up @@ -33,9 +34,6 @@ qtSubmodule {
substituteInPlace ./src/3rdparty/chromium/v8/build/standalone.gypi \
--replace /bin/echo ${coreutils}/bin/echo
# fix default SSL bundle location
sed -i -e 's,/cert.pem,/certs/ca-bundle.crt,' src/3rdparty/chromium/third_party/boringssl/src/crypto/x509/x509_def.c
# Fix library paths
sed -i \
-e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \
Expand All @@ -56,10 +54,16 @@ qtSubmodule {
-docdir $out/share/doc/qt5"
'';
propagatedBuildInputs = [
dbus zlib alsaLib
dbus zlib minizip alsaLib snappy nss protobuf jsoncpp libevent

# Image formats
libjpeg libpng libtiff
libjpeg libpng libtiff libwebp

# Video formats
srtp libvpx

# Audio formats
alsaLib libopus

# Text rendering
fontconfig freetype harfbuzz icu
Expand Down

0 comments on commit d5bd98e

Please sign in to comment.