public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #37889 from coreyoconnor/ninjaflags

Browse Source 
qtwebengine: correct how NIX_BUILD_CORES is propagated to the gn ninja
This commit is contained in:
Thomas Tuegel 2018-03-27 09:02:28 -05:00 committed by GitHub
commit 6cd5667d4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
View File

@ -63,8 +63,9 @@ qtModule {
src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
''; '';
preConfigure = '' preConfigure = ''
export MAKEFLAGS=-j$NIX_BUILD_CORES export NINJAFLAGS=-j$NIX_BUILD_CORES
if [ -d "$PWD/tools/qmake" ]; then if [ -d "$PWD/tools/qmake" ]; then
QMAKEPATH="$PWD/tools/qmake''${QMAKEPATH:+:}$QMAKEPATH" QMAKEPATH="$PWD/tools/qmake''${QMAKEPATH:+:}$QMAKEPATH"