diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-08-04 11:47:03 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-08-04 12:06:17 -0400 |
| commit | a956c7df87536717e4e04af11ae6d73dcb7a2ce7 (patch) | |
| tree | b29b70a0d190bd24ec5176e0d91dd59388480e81 | |
| parent | e920ba0b1ddd02f4de5f3810d82dea2d65d9590c (diff) | |
| download | guix-a956c7df87536717e4e04af11ae6d73dcb7a2ce7.tar.gz | |
build: qt-utils: Fix another regression.
This fixes another regression introduced with 1f466ed6be932526fc69e72ffd50390691d0d382, 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.
| -rw-r--r-- | guix/build/qt-utils.scm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index 180b3aad77..2e47f1bc02 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -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 |