summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-04-08 21:45:23 +0200
committerMarius Bakke <mbakke@fastmail.com>2020-04-08 21:45:23 +0200
commitc7eec67a93d58b2c0201f98071407f5a0cf549a7 (patch)
treea8decbfc70bf44fd9cc2bd17d12196cd28ef698b
parent155aaca7febe58b59a55c5d4cd5bc5abcbe66d39 (diff)
downloadguix-c7eec67a93d58b2c0201f98071407f5a0cf549a7.tar.gz
gnu: qtwebengine: Fix build with Ninja >= 1.10.
* gnu/packages/qt.scm (qtwebengine)[arguments]: Add phase
'patch-ninja-version-check'.
-rw-r--r--gnu/packages/qt.scm8
1 files changed, 8 insertions, 0 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index a5e2300f97..a3797bb5b0 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"))