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

Merge #100713: chromium: build on all cores

Browse Source
This commit is contained in:
Vladimír Čunát 2020-10-20 20:58:16 +02:00
commit 65d6adcf3e
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -319,15 +319,8 @@ let
NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option"; NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option";
buildPhase = let buildPhase = let
# Build paralelism: on Hydra the build was frequently running into memory
# exhaustion, and even other users might be running into similar issues.
# -j is halved to avoid memory problems, and -l is slightly increased
# so that the build gets slight preference before others
# (it will often be on "critical path" and at risk of timing out)
buildCommand = target: '' buildCommand = target: ''
ninja -C "${buildPath}" \ ninja -C "${buildPath}" -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES "${target}"
-j$(( ($NIX_BUILD_CORES+1) / 2 )) -l$(( $NIX_BUILD_CORES+1 )) \
"${target}"
( (
source chrome/installer/linux/common/installer.include source chrome/installer/linux/common/installer.include
PACKAGE=$packageName PACKAGE=$packageName

9
pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
View File

@ -352,15 +352,8 @@ let
NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option"; NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option";
buildPhase = let buildPhase = let
# Build paralelism: on Hydra the build was frequently running into memory
# exhaustion, and even other users might be running into similar issues.
# -j is halved to avoid memory problems, and -l is slightly increased
# so that the build gets slight preference before others
# (it will often be on "critical path" and at risk of timing out)
buildCommand = target: '' buildCommand = target: ''
ninja -C "${buildPath}" \ ninja -C "${buildPath}" -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES "${target}"
-j$(( ($NIX_BUILD_CORES+1) / 2 )) -l$(( $NIX_BUILD_CORES+1 )) \
"${target}"
( (
source chrome/installer/linux/common/installer.include source chrome/installer/linux/common/installer.include
PACKAGE=$packageName PACKAGE=$packageName