From 7906624425874069f1976a710eadb43147630cda Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Sun, 20 Nov 2016 13:10:47 +0100 Subject: [PATCH 1/2] qtwebengine: hardcode paths Hardcode the paths for which the default path resolution does not work in nix. --- .../development/libraries/qt-5/5.6/qtwebengine/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 dba3611683e..e5d7d0d4372 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix @@ -30,7 +30,12 @@ qtSubmodule { --replace /bin/echo ${coreutils}/bin/echo substituteInPlace ./src/3rdparty/chromium/v8/build/standalone.gypi \ --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+="\ -plugindir $out/lib/qt5/plugins \ -importdir $out/lib/qt5/imports \ From 1fb5a9b708a94de3c6e23403581318d16ccba463 Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Mon, 21 Nov 2016 20:59:05 +0100 Subject: [PATCH 2/2] qt5: Add qtwebengine and qtwebchannel to qt5.full --- pkgs/development/libraries/qt-5/5.6/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 0e40a7ac96d..8b4e924a733 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -106,7 +106,7 @@ let qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwayland - qtwebsockets qtx11extras qtxmlpatterns + qtwebchannel qtwebengine qtwebsockets qtx11extras qtxmlpatterns ]; makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh;