me/guix
Archived
1
0
Fork 0
Code Activity

gnu: qtwebengine: Fix build with Ninja >= 1.10.

Browse source 
* gnu/packages/qt.scm (qtwebengine)[arguments]: Add phase
'patch-ninja-version-check'.
This commit is contained in:
Marius Bakke 2020-04-08 21:45:23 +02:00
parent 155aaca7fe
commit c7eec67a93
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/qt.scm
View file

@ -1799,6 +1799,14 @@ message.")))
(substitute-keyword-arguments (package-arguments qtsvg) (substitute-keyword-arguments (package-arguments qtsvg)
((#:phases phases) ((#:phases phases)
`(modify-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 (add-before 'configure 'substitute-source
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))