public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt5.qtwebengine: use system libraries where possible

Browse Source 
Fixes #23987.
This commit is contained in:
Nikolay Amiantov 2017-03-22 23:57:37 +03:00
parent 3a948e6b07
commit 040b86a96e
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
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
@ -34,9 +35,6 @@ qtSubmodule {
substituteInPlace ./src/3rdparty/chromium/v8/build/standalone.gypi \ substituteInPlace ./src/3rdparty/chromium/v8/build/standalone.gypi \
--replace /bin/echo ${coreutils}/bin/echo --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 # Fix library paths
sed -i \ sed -i \
-e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \ -e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \
@ -54,10 +52,16 @@ qtSubmodule {
qmakeFlags = lib.optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs"; qmakeFlags = lib.optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs";
propagatedBuildInputs = [ propagatedBuildInputs = [
dbus zlib alsaLib dbus zlib minizip alsaLib snappy nss protobuf jsoncpp libevent
# Image formats # Image formats
libjpeg libpng libtiff libjpeg libpng libtiff libwebp
# Video formats
srtp libvpx
# Audio formats
alsaLib libopus
# Text rendering # Text rendering
fontconfig freetype harfbuzz icu fontconfig freetype harfbuzz icu

16
pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
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
@ -34,9 +35,6 @@ qtSubmodule {
substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/standalone.gypi \ substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/standalone.gypi \
--replace /bin/echo ${coreutils}/bin/echo --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 # Fix library paths
sed -i \ sed -i \
-e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \ -e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \
@ -54,10 +52,16 @@ qtSubmodule {
qmakeFlags = lib.optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs"; qmakeFlags = lib.optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs";
propagatedBuildInputs = [ propagatedBuildInputs = [
dbus zlib alsaLib dbus zlib minizip alsaLib snappy nss protobuf jsoncpp libevent
# Image formats # Image formats
libjpeg libpng libtiff libjpeg libpng libtiff libwebp
# Video formats
srtp libvpx
# Audio formats
alsaLib libopus
# Text rendering # Text rendering
fontconfig freetype harfbuzz icu fontconfig freetype harfbuzz icu