diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-11-22 14:33:21 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-22 14:33:21 -0600 |
| commit | faafaf344ad4eb3ec42d2353cc376462fb2f16da (patch) | |
| tree | 5ea62328c62363e7889c284fd937e1bd9337d153 /pkgs/development/libraries | |
| parent | f00f4b59b0cd743db10bf0a9c89aba404841c14e (diff) | |
| parent | 1fb5a9b708a94de3c6e23403581318d16ccba463 (diff) | |
| download | nixpkgs-faafaf344ad4eb3ec42d2353cc376462fb2f16da.tar nixpkgs-faafaf344ad4eb3ec42d2353cc376462fb2f16da.tar.gz nixpkgs-faafaf344ad4eb3ec42d2353cc376462fb2f16da.tar.bz2 nixpkgs-faafaf344ad4eb3ec42d2353cc376462fb2f16da.tar.lz nixpkgs-faafaf344ad4eb3ec42d2353cc376462fb2f16da.tar.xz nixpkgs-faafaf344ad4eb3ec42d2353cc376462fb2f16da.tar.zst nixpkgs-faafaf344ad4eb3ec42d2353cc376462fb2f16da.zip | |
Merge pull request #20569 from vandenoever/qtwebengine
qtwebengine: hardcode paths
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.6/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix | 7 |
2 files changed, 7 insertions, 2 deletions
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; 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 \ |