diff options
| author | Shea Levy <shea@shealevy.com> | 2018-03-28 09:36:47 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-03-28 09:36:47 -0400 |
| commit | 05e375d7103ac51e2da917965c37246c99f1ae4f (patch) | |
| tree | 7ec4e9a2f5b7b1e2dea7c3e059f5b40e1dac1569 /pkgs/development/libraries/qt-5/modules | |
| parent | 335934a073d6024d54c71bf82d5f8baab13abe75 (diff) | |
| parent | c7d7abc51e5f9b9c7481a83c47b37508bf08b05b (diff) | |
| download | nixlib-05e375d7103ac51e2da917965c37246c99f1ae4f.tar nixlib-05e375d7103ac51e2da917965c37246c99f1ae4f.tar.gz nixlib-05e375d7103ac51e2da917965c37246c99f1ae4f.tar.bz2 nixlib-05e375d7103ac51e2da917965c37246c99f1ae4f.tar.lz nixlib-05e375d7103ac51e2da917965c37246c99f1ae4f.tar.xz nixlib-05e375d7103ac51e2da917965c37246c99f1ae4f.tar.zst nixlib-05e375d7103ac51e2da917965c37246c99f1ae4f.zip | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/development/libraries/qt-5/modules')
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 4825c1b167cd..08345510d787 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -63,8 +63,9 @@ qtModule { src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc ''; + preConfigure = '' - export MAKEFLAGS=-j$NIX_BUILD_CORES + export NINJAFLAGS=-j$NIX_BUILD_CORES if [ -d "$PWD/tools/qmake" ]; then QMAKEPATH="$PWD/tools/qmake''${QMAKEPATH:+:}$QMAKEPATH" |