diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-07-22 18:58:48 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-07-22 18:58:48 +0200 |
| commit | ccad0e4d6973da7af8badfb7125f35f7e51eb2d7 (patch) | |
| tree | 15ff9da1c1c03b088d0ad9240f2c1878f5da5802 /gnu/packages/chromium.scm | |
| parent | d478cc043557ca3fcd5fced87d2e2c8e246eff03 (diff) | |
| parent | 26986544469ef290885f5f8d71006751e9e8daf8 (diff) | |
| download | patches-ccad0e4d6973da7af8badfb7125f35f7e51eb2d7.tar patches-ccad0e4d6973da7af8badfb7125f35f7e51eb2d7.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/chromium.scm')
| -rw-r--r-- | gnu/packages/chromium.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 7462e757de..3dccecba88 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -408,9 +408,6 @@ from forcing GEXP-PROMISE." (build-system gnu-build-system) (arguments `(#:tests? #f - ;; Chromiums build processes may consume up to 8GiB of memory per core. - ;; Disable parallel builds to avoid thrashing end user systems. - #:parallel-build? #f ;; FIXME: Chromiums RUNPATH lacks entries for some libraries, so ;; we have to disable validation and add a wrapper below. #:validate-runpath? #f @@ -467,6 +464,9 @@ from forcing GEXP-PROMISE." ;; Optimize for building everything at once, as opposed to ;; incrementally for development. See "docs/jumbo.md". "use_jumbo_build=true" + ;; The default file merge limit of 50 requires huge amounts of RAM. + ;; Cap it to make sure the build succeeds on commodity hardware. + "jumbo_file_merge_limit=8" ;; Prefer system libraries. "use_system_freetype=true" |