me
/
guix
Archived
1
0
Fork 0
Code

build: qt-utils: Fix another regression. 

This fixes another regression introduced with
1f466ed6be, which affected the packages bitmask,
hime, hime, nimf and vorta.

The fix is to provide a default qt-major-version when #:qtbase is missing,
such as when borrowing the qt-wrap phase in a package not using the Qt build
system.

* guix/build/qt-utils.scm (wrap-all-qt-programs)[qt-major-version]: Fall-back
to %default-qt-major-version when #:qtbase is #f.

Reported-by: John Kehayias <john.kehayias@protonmail.com> and others.
Maxim Cournoyer 2022-08-04 11:47:03 -04:00
parent e920ba0b1d
commit a956c7df87
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
guix/build/qt-utils.scm
View File

@ -144,9 +144,13 @@ QT-WRAP-EXCLUDED-OUTPUTS. This is useful when an output is known not
to contain any Qt binaries, and where wrapping would gratuitously
add a dependency of that output on Qt."
(define qt-major-version
(let ((_ version (package-name->name+version
(strip-store-file-name qtbase))))
(first (string-split version #\.))))
(if qtbase
(let ((_ version (package-name->name+version
(strip-store-file-name qtbase))))
(first (string-split version #\.)))
;; Provide a fall-back for build systems not having a #:qtbase
;; argument.
%default-qt-major-version))
(define (find-files-to-wrap output-dir)
(append-map