build-system: qt: Adjust indentation.

* guix/build-system/qt.scm (qt-build, qt-cross-build): Adjust indentation.
This commit is contained in:
Hartmut Goebel 2019-12-23 15:48:21 +01:00
parent fce8ec9e15
commit c19260ea00
No known key found for this signature in database
GPG Key ID: 634A8DFFD3F631DF

@ -106,60 +106,60 @@
(define* (qt-build store name inputs (define* (qt-build store name inputs
#:key (guile #f) #:key (guile #f)
(outputs '("out")) (configure-flags ''()) (outputs '("out")) (configure-flags ''())
(search-paths '()) (search-paths '())
(make-flags ''()) (make-flags ''())
(out-of-source? #t) (out-of-source? #t)
(build-type "RelWithDebInfo") (build-type "RelWithDebInfo")
(tests? #t) (tests? #t)
(test-target "test") (test-target "test")
(parallel-build? #t) (parallel-tests? #f) (parallel-build? #t) (parallel-tests? #f)
(validate-runpath? #t) (validate-runpath? #t)
(patch-shebangs? #t) (patch-shebangs? #t)
(strip-binaries? #t) (strip-binaries? #t)
(strip-flags ''("--strip-debug")) (strip-flags ''("--strip-debug"))
(strip-directories ''("lib" "lib64" "libexec" (strip-directories ''("lib" "lib64" "libexec"
"bin" "sbin")) "bin" "sbin"))
(phases '(@ (guix build qt-build-system) (phases '(@ (guix build qt-build-system)
%standard-phases)) %standard-phases))
(qt-wrap-excluded-outputs ''()) (qt-wrap-excluded-outputs ''())
(system (%current-system)) (system (%current-system))
(imported-modules %qt-build-system-modules) (imported-modules %qt-build-system-modules)
(modules '((guix build qt-build-system) (modules '((guix build qt-build-system)
(guix build utils)))) (guix build utils))))
"Build SOURCE using CMAKE, and with INPUTS. This assumes that SOURCE "Build SOURCE using CMAKE, and with INPUTS. This assumes that SOURCE
provides a 'CMakeLists.txt' file as its build system." provides a 'CMakeLists.txt' file as its build system."
(define builder (define builder
`(begin `(begin
(use-modules ,@modules) (use-modules ,@modules)
(qt-build #:source ,(match (assoc-ref inputs "source") (qt-build #:source ,(match (assoc-ref inputs "source")
(((? derivation? source)) (((? derivation? source))
(derivation->output-path source)) (derivation->output-path source))
((source) ((source)
source) source)
(source (source
source)) source))
#:system ,system #:system ,system
#:outputs %outputs #:outputs %outputs
#:inputs %build-inputs #:inputs %build-inputs
#:search-paths ',(map search-path-specification->sexp #:search-paths ',(map search-path-specification->sexp
search-paths) search-paths)
#:phases ,phases #:phases ,phases
#:qt-wrap-excluded-outputs ,qt-wrap-excluded-outputs #:qt-wrap-excluded-outputs ,qt-wrap-excluded-outputs
#: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?
#:build-type ,build-type #:build-type ,build-type
#:tests? ,tests? #:tests? ,tests?
#:test-target ,test-target #:test-target ,test-target
#:parallel-build? ,parallel-build? #:parallel-build? ,parallel-build?
#:parallel-tests? ,parallel-tests? #:parallel-tests? ,parallel-tests?
#:validate-runpath? ,validate-runpath? #:validate-runpath? ,validate-runpath?
#:patch-shebangs? ,patch-shebangs? #:patch-shebangs? ,patch-shebangs?
#:strip-binaries? ,strip-binaries? #:strip-binaries? ,strip-binaries?
#:strip-flags ,strip-flags #:strip-flags ,strip-flags
#:strip-directories ,strip-directories))) #:strip-directories ,strip-directories)))
(define guile-for-build (define guile-for-build
(match guile (match guile
@ -183,33 +183,33 @@ provides a 'CMakeLists.txt' file as its build system."
;;; ;;;
(define* (qt-cross-build store name (define* (qt-cross-build store name
#:key #:key
target native-drvs target-drvs target native-drvs target-drvs
(guile #f) (guile #f)
(outputs '("out")) (outputs '("out"))
(configure-flags ''()) (configure-flags ''())
(search-paths '()) (search-paths '())
(native-search-paths '()) (native-search-paths '())
(make-flags ''()) (make-flags ''())
(out-of-source? #t) (out-of-source? #t)
(build-type "RelWithDebInfo") (build-type "RelWithDebInfo")
(tests? #f) ; nothing can be done (tests? #f) ; nothing can be done
(test-target "test") (test-target "test")
(parallel-build? #t) (parallel-tests? #f) (parallel-build? #t) (parallel-tests? #f)
(validate-runpath? #t) (validate-runpath? #t)
(patch-shebangs? #t) (patch-shebangs? #t)
(strip-binaries? #t) (strip-binaries? #t)
(strip-flags ''("--strip-debug" (strip-flags ''("--strip-debug"
"--enable-deterministic-archives")) "--enable-deterministic-archives"))
(strip-directories ''("lib" "lib64" "libexec" (strip-directories ''("lib" "lib64" "libexec"
"bin" "sbin")) "bin" "sbin"))
(phases '(@ (guix build qt-build-system) (phases '(@ (guix build qt-build-system)
%standard-phases)) %standard-phases))
(system (%current-system)) (system (%current-system))
(build (nix-system->gnu-triplet system)) (build (nix-system->gnu-triplet system))
(imported-modules %qt-build-system-modules) (imported-modules %qt-build-system-modules)
(modules '((guix build qt-build-system) (modules '((guix build qt-build-system)
(guix build utils)))) (guix build utils))))
"Cross-build NAME using CMAKE for TARGET, where TARGET is a GNU triplet and "Cross-build NAME using CMAKE for TARGET, where TARGET is a GNU triplet and
with INPUTS. This assumes that SOURCE provides a 'CMakeLists.txt' file as its with INPUTS. This assumes that SOURCE provides a 'CMakeLists.txt' file as its
build system." build system."
@ -238,37 +238,37 @@ build system."
target-drvs)) target-drvs))
(qt-build #:source ,(match (assoc-ref native-drvs "source") (qt-build #:source ,(match (assoc-ref native-drvs "source")
(((? derivation? source)) (((? derivation? source))
(derivation->output-path source)) (derivation->output-path source))
((source) ((source)
source) source)
(source (source
source)) source))
#:system ,system #:system ,system
#:build ,build #:build ,build
#:target ,target #:target ,target
#:outputs %outputs #:outputs %outputs
#:inputs %build-target-inputs #:inputs %build-target-inputs
#:native-inputs %build-host-inputs #:native-inputs %build-host-inputs
#:search-paths ',(map search-path-specification->sexp #:search-paths ',(map search-path-specification->sexp
search-paths) search-paths)
#:native-search-paths ',(map #:native-search-paths ',(map
search-path-specification->sexp search-path-specification->sexp
native-search-paths) native-search-paths)
#:phases ,phases #:phases ,phases
#: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?
#:build-type ,build-type #:build-type ,build-type
#:tests? ,tests? #:tests? ,tests?
#:test-target ,test-target #:test-target ,test-target
#:parallel-build? ,parallel-build? #:parallel-build? ,parallel-build?
#:parallel-tests? ,parallel-tests? #:parallel-tests? ,parallel-tests?
#:validate-runpath? ,validate-runpath? #:validate-runpath? ,validate-runpath?
#:patch-shebangs? ,patch-shebangs? #:patch-shebangs? ,patch-shebangs?
#:strip-binaries? ,strip-binaries? #:strip-binaries? ,strip-binaries?
#:strip-flags ,strip-flags #:strip-flags ,strip-flags
#:strip-directories ,strip-directories)))) #:strip-directories ,strip-directories))))
(define guile-for-build (define guile-for-build
(match guile (match guile