futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: qttools: Add clang-15 as input.

Browse Source 
* gnu/packages/qt.scm (qttools) [inputs]: Add clang-15, so that the qdoc
command can be built.
[phases] {sanity-check}: New phase, to guard against a problem that proved
difficult to isolate.
This commit is contained in:
Maxim Cournoyer 2022-11-10 12:40:38 -05:00
parent d1dc2c47fe
commit 085831010c
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/qt.scm
View File

@ -1866,9 +1866,22 @@ that helps in Qt development.")))
(list (list
;; The build system attempts to fetch online resources and fails when ;; The build system attempts to fetch online resources and fails when
;; building the test suite. ;; building the test suite.
#:configure-flags #~(list "-DQT_BUILD_TESTS=OFF"))) #:configure-flags #~(list "-DQT_BUILD_TESTS=OFF")
#:phases #~(modify-phases %standard-phases
(add-after 'install 'sanity-check
(lambda* (#:key outputs #:allow-other-keys)
;; This validation exists to validate that the dynamic
;; library for Clang works as intended; there was
;; originally problems due to left-overs patching the
;; value of BUILD_SHARED_LIBS in CLANG-FROM-LLVM that
;; would cause the following error: "CommandLine Error:
;; Option 'filter' registered more than once!"
(invoke/quiet (search-input-file outputs "bin/qdoc")
"--help"))))))
(native-inputs (list perl qtdeclarative vulkan-headers)) (native-inputs (list perl qtdeclarative vulkan-headers))
(inputs (list libxkbcommon mesa qtbase)) ;; Use clang-15, which is built using as a single shared library, which is
;; what the build system of qttools expects.
(inputs (list clang-15 libxkbcommon mesa qtbase))
(home-page (package-home-page qtbase)) (home-page (package-home-page qtbase))
(synopsis "Qt Tools and Designer modules") (synopsis "Qt Tools and Designer modules")
(description "The Qt Tools module provides a set of applications to browse (description "The Qt Tools module provides a set of applications to browse