diff options
| author | Thomas Tuegel <ttuegel@secure.mailbox.org> | 2018-03-27 09:02:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-27 09:02:28 -0500 |
| commit | 6cd5667d4d974c2e89cc990a1abe42fd62366411 (patch) | |
| tree | 7a1a9e42cdc38d29f1158bd440fd06ab031cd267 | |
| parent | 29e757ecc537baaa7a51eee69f4da7c0ab02b4bf (diff) | |
| parent | 807a308623441b6b765728d22751356d6e274a17 (diff) | |
| download | nixlib-6cd5667d4d974c2e89cc990a1abe42fd62366411.tar nixlib-6cd5667d4d974c2e89cc990a1abe42fd62366411.tar.gz nixlib-6cd5667d4d974c2e89cc990a1abe42fd62366411.tar.bz2 nixlib-6cd5667d4d974c2e89cc990a1abe42fd62366411.tar.lz nixlib-6cd5667d4d974c2e89cc990a1abe42fd62366411.tar.xz nixlib-6cd5667d4d974c2e89cc990a1abe42fd62366411.tar.zst nixlib-6cd5667d4d974c2e89cc990a1abe42fd62366411.zip | |
Merge pull request #37889 from coreyoconnor/ninjaflags
qtwebengine: correct how NIX_BUILD_CORES is propagated to the gn ninja
| -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 df9995bc3b9f..7e91cff065dd 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" |