diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-05-08 23:24:14 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-05-11 21:55:01 +0200 |
| commit | 16fbbf6a85eeefda2bec987d279b097f34fdc5f4 (patch) | |
| tree | 5d39353c714aa3f623a4eaa718295d82376c9ff4 /gnu/packages/qt.scm | |
| parent | b8bb2f0793aa2c5ff32956a90a0cfdb94bbe7a89 (diff) | |
| download | guix-16fbbf6a85eeefda2bec987d279b097f34fdc5f4.tar guix-16fbbf6a85eeefda2bec987d279b097f34fdc5f4.tar.gz | |
gnu: re2: Update to 2020-05-01.
* gnu/packages/regex.scm (re2): Update to 2020-05-01.
[source](modules, snippet): New fields.
* gnu/packages/chromium.scm (ungoogled-chromium)[arguments]: Add substitution
to adjust for re2 API change.
* gnu/packages/qt.scm (qtwebengine)[arguments]: Likewise.
Diffstat (limited to 'gnu/packages/qt.scm')
| -rw-r--r-- | gnu/packages/qt.scm | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8a57127771..abd1dc6d6b 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1810,6 +1810,15 @@ message."))) (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) `(modify-phases ,phases + (add-after 'unpack 'fix-build-with-newer-re2 + (lambda _ + ;; Adjust for API change in re2, taken from + ;; https://chromium-review.googlesource.com/c/chromium/src/+/2145261 + (substitute* "src/3rdparty/chromium/components/autofill/core\ +/browser/address_rewriter.cc" + (("options\\.set_utf8\\(true\\)") + "options.set_encoding(RE2::Options::EncodingUTF8)")) + #t)) (add-after 'unpack 'patch-ninja-version-check (lambda _ ;; The build system assumes the system Ninja is too old because |