Merge branch 'master' into core-updates-frozen

This commit is contained in:
Ludovic Courtès 2021-09-07 11:04:44 +02:00
commit d9dfbf886d
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
258 changed files with 218381 additions and 180777 deletions

View file

@ -98,9 +98,15 @@
"10c5xs5shk0dcshpdxg564ay5y8hgmvfvmlhmhjf0dy79kcah3c3"))))
(build-system cmake-build-system)
(native-inputs
`(("qtbase" ,qtbase-5))) ; For tests (needs qmake)
;; Add test dependency, except on armhf where building it is too
;; expensive.
(if (and (not (%current-target-system))
(string=? (%current-system) "armhf-linux"))
'()
`(("qtbase" ,qtbase-5)))) ;for tests (needs qmake)
(arguments
`(#:phases
`(#:tests? ,(not (null? (package-native-inputs this-package)))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-lib-path
(lambda _