amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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.
This commit is contained in:
Maxim Cournoyer 2022-08-01 11:58:39 -04:00
parent f1b9ae8c20
commit 4905b5b839
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
guix/build-system/qt.scm
View file

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