01/03: build-system: qt: Ensure a default value is provided for #:qtbase.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit 4905b5b83904366d068bde899aae15288cc1adcb
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Mon Aug 1 11:58:39 2022 -0400

    build-system: qt: Ensure a default value is provided for #:qtbase.
    
    * guix/build-system/qt.scm (qt-build)[qtbase]: Specify a default value.  
Lower
    it using ungexp-native.
    (qt-cross-build): Likewise.
    
    Reported-by: Maxime Devos <maximedevos@telenet.be> and others.
---
 guix/build-system/qt.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm
index bd47ade3fc..a9bf728f25 100644
--- a/guix/build-system/qt.scm
+++ b/guix/build-system/qt.scm
@@ -122,7 +122,7 @@
 
 (define* (qt-build name inputs
                    #:key
-                   qtbase
+                   (qtbase (default-qtbase))
                    source (guile #f)
                    (outputs '("out")) (configure-flags ''())
                    (search-paths '())
@@ -161,7 +161,7 @@ provides a 'CMakeLists.txt' file as its build system."
                     #:phases #$(if (pair? phases)
                                    (sexp->gexp phases)
                                    phases)
-                    #:qtbase #$qtbase
+                    #:qtbase #+qtbase
                     #:qt-wrap-excluded-outputs #$qt-wrap-excluded-outputs
                     #:qt-wrap-excluded-inputs #$qt-wrap-excluded-inputs
                     #:configure-flags #$configure-flags
@@ -193,7 +193,7 @@ provides a 'CMakeLists.txt' file as its build system."
                          #:key
                          source target
                          build-inputs target-inputs host-inputs
-                         qtbase
+                         (qtbase (default-qtbase))
                          (guile #f)
                          (outputs '("out"))
                          (configure-flags ''())
@@ -250,7 +250,7 @@ build system."
                                               search-path-specification->sexp
                                               native-search-paths)
                     #:phases #$phases
-                    #:qtbase #$qtbase
+                    #:qtbase #+qtbase
                     #:configure-flags #$configure-flags
                     #:make-flags #$make-flags
                     #:out-of-source? #$out-of-source?