diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-09-01 12:24:47 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-09-01 12:24:47 +0200 |
commit | 017561209e933f3de086e04211dc48cf37d1ee82 (patch) | |
tree | 883285a11cac31a50515843365941d53cd1a1079 /pkgs/applications/networking/browsers/chromium/common.nix | |
parent | 7b6251b4dceb8b2f0213e8a7d76356b45fba432e (diff) | |
download | nixpkgs-017561209e933f3de086e04211dc48cf37d1ee82.tar nixpkgs-017561209e933f3de086e04211dc48cf37d1ee82.tar.gz nixpkgs-017561209e933f3de086e04211dc48cf37d1ee82.tar.bz2 nixpkgs-017561209e933f3de086e04211dc48cf37d1ee82.tar.lz nixpkgs-017561209e933f3de086e04211dc48cf37d1ee82.tar.xz nixpkgs-017561209e933f3de086e04211dc48cf37d1ee82.tar.zst nixpkgs-017561209e933f3de086e04211dc48cf37d1ee82.zip |
chromium: try to hack around Hydra problems
Discussion: https://github.com/NixOS/nixpkgs/commit/e8f1ddcbd1d
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/common.nix')
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 7802e1bf1b5..33b8ee220ba 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -228,9 +228,14 @@ 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: '' ninja -C "${buildPath}" \ - -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \ + -j$(( ($NIX_BUILD_CORES+1) / 2 )) -l$(( $NIX_BUILD_CORES+1 )) \ "${target}" '' + optionalString (target == "mksnapshot" || target == "chrome") '' paxmark m "${buildPath}/${target}" |