branch core-updates updated: gnu: qtwebengine: Fix build with Ninja >= 1.10.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

mbakke pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new c7eec67  gnu: qtwebengine: Fix build with Ninja >= 1.10.
c7eec67 is described below

commit c7eec67a93d58b2c0201f98071407f5a0cf549a7
Author: Marius Bakke <address@hidden>
AuthorDate: Wed Apr 8 21:45:23 2020 +0200

    gnu: qtwebengine: Fix build with Ninja >= 1.10.
    
    * gnu/packages/qt.scm (qtwebengine)[arguments]: Add phase
    'patch-ninja-version-check'.
---
 gnu/packages/qt.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index a5e2300..a3797bb 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1799,6 +1799,14 @@ message.")))
      (substitute-keyword-arguments (package-arguments qtsvg)
        ((#:phases phases)
         `(modify-phases ,phases
+           (add-after 'unpack 'patch-ninja-version-check
+             (lambda _
+               ;; The build system assumes the system Ninja is too old because
+               ;; it only checks for versions 1.7 through 1.9.  We have 1.10.
+               (substitute* "configure.pri"
+                 (("1\\.\\[7-9\\]\\.\\*")
+                  "1.([7-9]|1[0-9]).*"))
+               #t))
            (add-before 'configure 'substitute-source
              (lambda* (#:key inputs outputs #:allow-other-keys)
                (let ((out (assoc-ref outputs "out"))