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

Merge pull request #20569 from vandenoever/qtwebengine

Browse Source 
qtwebengine: hardcode paths
This commit is contained in:
Thomas Tuegel 2016-11-22 14:33:21 -06:00 committed by GitHub
commit faafaf344a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/qt-5/5.6/default.nix
View File

@ -106,7 +106,7 @@ let
qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects
qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript
qtsensors qtserialport qtsvg qttools qttranslations qtwayland qtsensors qtserialport qtsvg qttools qttranslations qtwayland
qtwebsockets qtx11extras qtxmlpatterns qtwebchannel qtwebengine qtwebsockets qtx11extras qtxmlpatterns
]; ];
makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh; makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh;

7
pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix
View File

@ -30,7 +30,12 @@ qtSubmodule {
--replace /bin/echo ${coreutils}/bin/echo --replace /bin/echo ${coreutils}/bin/echo
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
# hardcode paths for which default path resolution does not work in nix
sed -i -e 's,\(static QString potentialResourcesPath =\).*,\1 QLatin1String("'$out'/resources");,' src/core/web_engine_library_info.cpp
sed -i -e 's,\(static QString processPath\),\1 = QLatin1String("'$out'/libexec/QtWebEngineProcess"),' src/core/web_engine_library_info.cpp
sed -i -e 's,\(static QString potentialLocalesPath =\).*,\1 QLatin1String("'$out'/translations/qtwebengine_locales");,' src/core/web_engine_library_info.cpp
configureFlags+="\ configureFlags+="\
-plugindir $out/lib/qt5/plugins \ -plugindir $out/lib/qt5/plugins \
-importdir $out/lib/qt5/imports \ -importdir $out/lib/qt5/imports \