summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-08-01 11:58:39 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-08-01 12:48:37 -0400
commit4905b5b83904366d068bde899aae15288cc1adcb (patch)
treefaf3a538d2987477931f505a2f1d52825487742d
parentf1b9ae8c20ef0b9c85e4d801ae85accbe6654ff5 (diff)
downloadguix-4905b5b83904366d068bde899aae15288cc1adcb.tar.gz
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.
-rw-r--r--guix/build-system/qt.scm8
1 files 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?