ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: qtbase: Update to 6.3.2 and build with Make.

Browse source 
* gnu/packages/qt.scm (qtbase): Update to 6.3.2.
[configure-flags]: Delete "-GNinja".
[phases]: Delete build and install phases overrides.
[native-inputs]: Remove ninja.
This commit is contained in:
Maxim Cournoyer 2023-03-06 22:42:42 -05:00
parent c0650cf5b7
commit d21de821f7
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gnu/packages/qt.scm
View file

@ -19,7 +19,7 @@
;;; Copyright © 2020 TomZ <tomz@freedommail.ch>
;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021, 2022 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021 Nicolò Balzarotti <nicolo@nixo.xyz>
@ -590,13 +590,13 @@ (define-public qtbase-5
(define-public qtbase
(package/inherit qtbase-5
(name "qtbase")
(version "6.3.1")
(version "6.3.2")
(source (origin
(inherit (package-source qtbase-5))
(uri (qt-urls name version))
(sha256
(base32
"00sfya41ihqb0zwg6wf1kiy02iymj6mk584hhk2c4s94khfl4r0a"))
"19m9r8sf9mvyrwipn44if3nhding4ljys2mwf04b7dkhz16vlabr"))
(modules '((guix build utils)))
(snippet
;; corelib uses bundled harfbuzz, md4, md5, sha3
@ -612,8 +612,7 @@ (define-public qtbase
(substitute-keyword-arguments (package-arguments qtbase-5)
((#:configure-flags _ ''())
`(let ((out (assoc-ref %outputs "out")))
(list "-GNinja" ;the build fails otherwise
"-DQT_BUILD_TESTS=ON"
(list "-DQT_BUILD_TESTS=ON"
(string-append "-DINSTALL_ARCHDATADIR=" out "/lib/qt6")
(string-append "-DINSTALL_DATADIR=" out "/share/qt6")
(string-append "-DINSTALL_DOCDIR=" out "/share/doc/qt6")
@ -704,12 +703,6 @@ (define-public qtbase
"/usr/bin/env python3"))))
(replace 'configure
(assoc-ref %standard-phases 'configure))
(replace 'build
(lambda* (#:key parallel-build? #:allow-other-keys)
(apply invoke "cmake" "--build" "."
(if parallel-build?
`("--parallel" ,(number->string (parallel-job-count)))
'()))))
(delete 'check) ;move after patch-prl-files
(add-after 'patch-prl-files 'check
(lambda* (#:key tests? parallel-tests? #:allow-other-keys)
@ -812,9 +805,6 @@ (define-public qtbase
"tst_qcompleter"
"tst_qfiledialog") "|")
")")))))
(replace 'install
(lambda _
(invoke "cmake" "--install" ".")))
(replace 'patch-mkspecs
(lambda* (#:key outputs #:allow-other-keys)
(let* ((archdata (search-input-directory outputs "lib/qt6"))
@ -855,8 +845,7 @@ (define-public qtbase
(("\\$\\$\\[QT_HOST_DATA/src\\]") archdata)))))))))
(native-inputs
(modify-inputs (package-native-inputs qtbase-5)
(prepend ninja
wayland-protocols
(prepend wayland-protocols
xvfb-run)))
(inputs
(modify-inputs (package-inputs qtbase-5)