diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-02-17 22:48:50 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-02-19 23:52:07 -0500 |
| commit | 518f997eb5a893bdc16a8f18f0b1e98b895f49a9 (patch) | |
| tree | aacbafda3978491388c06ca5747baf1df41d457f /pkgs/development/libraries/qt-5/modules | |
| parent | 4bbd00e934c5d529bf4b5c08ddeea6a6c62ff113 (diff) | |
| download | nixlib-518f997eb5a893bdc16a8f18f0b1e98b895f49a9.tar nixlib-518f997eb5a893bdc16a8f18f0b1e98b895f49a9.tar.gz nixlib-518f997eb5a893bdc16a8f18f0b1e98b895f49a9.tar.bz2 nixlib-518f997eb5a893bdc16a8f18f0b1e98b895f49a9.tar.lz nixlib-518f997eb5a893bdc16a8f18f0b1e98b895f49a9.tar.xz nixlib-518f997eb5a893bdc16a8f18f0b1e98b895f49a9.tar.zst nixlib-518f997eb5a893bdc16a8f18f0b1e98b895f49a9.zip | |
qt5.qtwebkit: don't set qmake variables for cmake build
Diffstat (limited to 'pkgs/development/libraries/qt-5/modules')
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 90b4168ff21c..6b43f6ed25c0 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -43,7 +43,7 @@ qtModule { # QtWebKit overrides qmake's default_pre and default_post features, # so its custom qmake files must be found first at the front of QMAKEPATH. - preConfigure = '' + preConfigure = stdenv.lib.optionalString (!usingAnnulenWebkitFork) '' QMAKEPATH="$PWD/Tools/qmake''${QMAKEPATH:+:}$QMAKEPATH" fixQtBuiltinPaths . '*.pr?' # Fix hydra's "Log limit exceeded" |