Merge pull request #37889 from coreyoconnor/ninjaflags

qtwebengine: correct how NIX_BUILD_CORES is propagated to the gn ninja
2018-03-27 09:02:28 -05:00
parent 29e757ecc5 807a308623
commit 6cd5667d4d
1 changed files with 2 additions and 1 deletions
--- 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"