diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-12-05 17:57:35 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-12-05 17:57:35 +0100 |
| commit | 9d5aa009062a49bd035ae33e37f6562526e7d38c (patch) | |
| tree | 4ff2302863a5cf9f3cf604240ea793152156f532 /gnu/packages/chromium.scm | |
| parent | 60bd56c6d8368c23dcd97b26501771c82316fc8c (diff) | |
| parent | 2c2fc24b899d3286774f60405888718d98211213 (diff) | |
| download | guix-9d5aa009062a49bd035ae33e37f6562526e7d38c.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/chromium.scm')
| -rw-r--r-- | gnu/packages/chromium.scm | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 225a301a65..9d194de0e6 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -242,8 +242,8 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %chromium-version "78.0.3904.97") -(define %ungoogled-revision "acaf16383f264d8a2f24142ad054c9b4355771d3") +(define %chromium-version "78.0.3904.108") +(define %ungoogled-revision "8f065138317a6152b20decc224027a5192ba76b1") (define %debian-revision "e43d74632091324774a5049668782dba7b09cf72") (define package-revision "0") (define %package-version (string-append %chromium-version "-" @@ -258,7 +258,7 @@ from forcing GEXP-PROMISE." %chromium-version ".tar.xz")) (sha256 (base32 - "01wx5bi397d80za0sdfwgfbjj6n2ad2i31zmcrhm6wzryjwrmx6i")))) + "03jvfz68nvmmrplygf96sh0l347p4h03c8vpw8yrglh6ycwkiigr")))) (define %ungoogled-origin (origin @@ -269,7 +269,7 @@ from forcing GEXP-PROMISE." (string-take %ungoogled-revision 7))) (sha256 (base32 - "1gqbch6dnww3c3vn1i4nb07iz1f78mws9dsxscj3rsrkcgwhsdz8")))) + "0zix90jz82hpym9jmyf99yw19swaf13ps6szi60wccmz1gccv77g")))) (define %debian-origin (origin @@ -660,8 +660,8 @@ from forcing GEXP-PROMISE." ;; their current status for convenience. (format #t "Dumping configure flags...\n") (invoke "gn" "args" "out/Release" "--list")))) - (replace 'build - (lambda* (#:key (parallel-build? #t) #:allow-other-keys) + (add-before 'build 'increase-resource-limits + (lambda _ ;; XXX: Chromiums linking step requires a lot of simultaneous file ;; accesses. Having a too low ulimit will result in bogus linker ;; errors such as "foo.a: error adding symbols: malformed archive". @@ -677,7 +677,9 @@ from forcing GEXP-PROMISE." (format #t "increased maximum number of open files from ~d to ~d~%" soft (if hard (min hard 4096) 4096))))) - + #t)) + (replace 'build + (lambda* (#:key (parallel-build? #t) #:allow-other-keys) (invoke "ninja" "-C" "out/Release" "-j" (if parallel-build? (number->string (parallel-job-count)) |