Merge remote-tracking branch 'origin/master' into staging

2018-03-28 09:36:47 -04:00
parent 335934a073 c7d7abc51e
commit 05e375d710
196 changed files with 7758 additions and 4938 deletions
@@ -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"