[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
20/285: build-system: qt: Adjust indentation.
|
From: |
guix-commits |
|
Subject: |
20/285: build-system: qt: Adjust indentation. |
|
Date: |
Sun, 29 Dec 2019 20:43:52 -0500 (EST) |
kkebreau pushed a commit to branch wip-gnome3.34
in repository guix.
commit a72d01cc131ff4293af775f13bcfa0203d603c3b
Author: Hartmut Goebel <address@hidden>
Date: Mon Dec 23 15:48:21 2019 +0100
build-system: qt: Adjust indentation.
* guix/build-system/qt.scm (qt-build, qt-cross-build): Adjust indentation.
---
guix/build-system/qt.scm | 210 +++++++++++++++++++++++------------------------
1 file changed, 105 insertions(+), 105 deletions(-)
diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm
index 67fdfa1..118022e 100644
--- a/guix/build-system/qt.scm
+++ b/guix/build-system/qt.scm
@@ -106,60 +106,60 @@
(define* (qt-build store name inputs
- #:key (guile #f)
- (outputs '("out")) (configure-flags ''())
- (search-paths '())
- (make-flags ''())
- (out-of-source? #t)
- (build-type "RelWithDebInfo")
- (tests? #t)
- (test-target "test")
- (parallel-build? #t) (parallel-tests? #f)
- (validate-runpath? #t)
- (patch-shebangs? #t)
- (strip-binaries? #t)
- (strip-flags ''("--strip-debug"))
- (strip-directories ''("lib" "lib64" "libexec"
- "bin" "sbin"))
- (phases '(@ (guix build qt-build-system)
- %standard-phases))
- (qt-wrap-excluded-outputs ''())
- (system (%current-system))
- (imported-modules %qt-build-system-modules)
- (modules '((guix build qt-build-system)
- (guix build utils))))
+ #:key (guile #f)
+ (outputs '("out")) (configure-flags ''())
+ (search-paths '())
+ (make-flags ''())
+ (out-of-source? #t)
+ (build-type "RelWithDebInfo")
+ (tests? #t)
+ (test-target "test")
+ (parallel-build? #t) (parallel-tests? #f)
+ (validate-runpath? #t)
+ (patch-shebangs? #t)
+ (strip-binaries? #t)
+ (strip-flags ''("--strip-debug"))
+ (strip-directories ''("lib" "lib64" "libexec"
+ "bin" "sbin"))
+ (phases '(@ (guix build qt-build-system)
+ %standard-phases))
+ (qt-wrap-excluded-outputs ''())
+ (system (%current-system))
+ (imported-modules %qt-build-system-modules)
+ (modules '((guix build qt-build-system)
+ (guix build utils))))
"Build SOURCE using CMAKE, and with INPUTS. This assumes that SOURCE
provides a 'CMakeLists.txt' file as its build system."
(define builder
`(begin
(use-modules ,@modules)
(qt-build #:source ,(match (assoc-ref inputs "source")
- (((? derivation? source))
- (derivation->output-path source))
- ((source)
- source)
- (source
- source))
- #:system ,system
- #:outputs %outputs
- #:inputs %build-inputs
- #:search-paths ',(map search-path-specification->sexp
- search-paths)
- #:phases ,phases
- #:qt-wrap-excluded-outputs ,qt-wrap-excluded-outputs
- #:configure-flags ,configure-flags
- #:make-flags ,make-flags
- #:out-of-source? ,out-of-source?
- #:build-type ,build-type
- #:tests? ,tests?
- #:test-target ,test-target
- #:parallel-build? ,parallel-build?
- #:parallel-tests? ,parallel-tests?
- #:validate-runpath? ,validate-runpath?
- #:patch-shebangs? ,patch-shebangs?
- #:strip-binaries? ,strip-binaries?
- #:strip-flags ,strip-flags
- #:strip-directories ,strip-directories)))
+ (((? derivation? source))
+ (derivation->output-path source))
+ ((source)
+ source)
+ (source
+ source))
+ #:system ,system
+ #:outputs %outputs
+ #:inputs %build-inputs
+ #:search-paths ',(map search-path-specification->sexp
+ search-paths)
+ #:phases ,phases
+ #:qt-wrap-excluded-outputs ,qt-wrap-excluded-outputs
+ #:configure-flags ,configure-flags
+ #:make-flags ,make-flags
+ #:out-of-source? ,out-of-source?
+ #:build-type ,build-type
+ #:tests? ,tests?
+ #:test-target ,test-target
+ #:parallel-build? ,parallel-build?
+ #:parallel-tests? ,parallel-tests?
+ #:validate-runpath? ,validate-runpath?
+ #:patch-shebangs? ,patch-shebangs?
+ #:strip-binaries? ,strip-binaries?
+ #:strip-flags ,strip-flags
+ #:strip-directories ,strip-directories)))
(define guile-for-build
(match guile
@@ -183,33 +183,33 @@ provides a 'CMakeLists.txt' file as its build system."
;;;
(define* (qt-cross-build store name
- #:key
- target native-drvs target-drvs
- (guile #f)
- (outputs '("out"))
- (configure-flags ''())
- (search-paths '())
- (native-search-paths '())
- (make-flags ''())
- (out-of-source? #t)
- (build-type "RelWithDebInfo")
- (tests? #f) ; nothing can be done
- (test-target "test")
- (parallel-build? #t) (parallel-tests? #f)
- (validate-runpath? #t)
- (patch-shebangs? #t)
- (strip-binaries? #t)
- (strip-flags ''("--strip-debug"
- "--enable-deterministic-archives"))
- (strip-directories ''("lib" "lib64" "libexec"
- "bin" "sbin"))
- (phases '(@ (guix build qt-build-system)
+ #:key
+ target native-drvs target-drvs
+ (guile #f)
+ (outputs '("out"))
+ (configure-flags ''())
+ (search-paths '())
+ (native-search-paths '())
+ (make-flags ''())
+ (out-of-source? #t)
+ (build-type "RelWithDebInfo")
+ (tests? #f) ; nothing can be done
+ (test-target "test")
+ (parallel-build? #t) (parallel-tests? #f)
+ (validate-runpath? #t)
+ (patch-shebangs? #t)
+ (strip-binaries? #t)
+ (strip-flags ''("--strip-debug"
+ "--enable-deterministic-archives"))
+ (strip-directories ''("lib" "lib64" "libexec"
+ "bin" "sbin"))
+ (phases '(@ (guix build qt-build-system)
%standard-phases))
- (system (%current-system))
- (build (nix-system->gnu-triplet system))
- (imported-modules %qt-build-system-modules)
- (modules '((guix build qt-build-system)
- (guix build utils))))
+ (system (%current-system))
+ (build (nix-system->gnu-triplet system))
+ (imported-modules %qt-build-system-modules)
+ (modules '((guix build qt-build-system)
+ (guix build utils))))
"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
build system."
@@ -238,37 +238,37 @@ build system."
target-drvs))
(qt-build #:source ,(match (assoc-ref native-drvs "source")
- (((? derivation? source))
- (derivation->output-path source))
- ((source)
- source)
- (source
- source))
- #:system ,system
- #:build ,build
- #:target ,target
- #:outputs %outputs
- #:inputs %build-target-inputs
- #:native-inputs %build-host-inputs
- #:search-paths ',(map search-path-specification->sexp
- search-paths)
- #:native-search-paths ',(map
- search-path-specification->sexp
- native-search-paths)
- #:phases ,phases
- #:configure-flags ,configure-flags
- #:make-flags ,make-flags
- #:out-of-source? ,out-of-source?
- #:build-type ,build-type
- #:tests? ,tests?
- #:test-target ,test-target
- #:parallel-build? ,parallel-build?
- #:parallel-tests? ,parallel-tests?
- #:validate-runpath? ,validate-runpath?
- #:patch-shebangs? ,patch-shebangs?
- #:strip-binaries? ,strip-binaries?
- #:strip-flags ,strip-flags
- #:strip-directories ,strip-directories))))
+ (((? derivation? source))
+ (derivation->output-path source))
+ ((source)
+ source)
+ (source
+ source))
+ #:system ,system
+ #:build ,build
+ #:target ,target
+ #:outputs %outputs
+ #:inputs %build-target-inputs
+ #:native-inputs %build-host-inputs
+ #:search-paths ',(map search-path-specification->sexp
+ search-paths)
+ #:native-search-paths ',(map
+ search-path-specification->sexp
+ native-search-paths)
+ #:phases ,phases
+ #:configure-flags ,configure-flags
+ #:make-flags ,make-flags
+ #:out-of-source? ,out-of-source?
+ #:build-type ,build-type
+ #:tests? ,tests?
+ #:test-target ,test-target
+ #:parallel-build? ,parallel-build?
+ #:parallel-tests? ,parallel-tests?
+ #:validate-runpath? ,validate-runpath?
+ #:patch-shebangs? ,patch-shebangs?
+ #:strip-binaries? ,strip-binaries?
+ #:strip-flags ,strip-flags
+ #:strip-directories ,strip-directories))))
(define guile-for-build
(match guile
- 12/285: gnu: guix-data-service: Update to 0.0.1-9.31110ac., (continued)
- 12/285: gnu: guix-data-service: Update to 0.0.1-9.31110ac., guix-commits, 2019/12/29
- 25/285: gnu: ktouch: Use fixed qt-build-system., guix-commits, 2019/12/29
- 09/285: gnu: Add polari., guix-commits, 2019/12/29
- 23/285: gnu: kdevelop: Use fixed qt-build-system., guix-commits, 2019/12/29
- 16/285: bootloader: grub: Add firmware setup entry., guix-commits, 2019/12/29
- 18/285: gnu: nano: Update to 4.7., guix-commits, 2019/12/29
- 17/285: gnu: icecat: Fix linking with ffmpeg., guix-commits, 2019/12/29
- 19/285: build-system: qt: Actually use qt-build-system, not cmake-build-system., guix-commits, 2019/12/29
- 22/285: gnu: sddm: Use fixed qt-build-system., guix-commits, 2019/12/29
- 21/285: Revert "gnu: mumble: Actually modify qt-build-system.", guix-commits, 2019/12/29
- 20/285: build-system: qt: Adjust indentation.,
guix-commits <=
- 27/285: gnu: Add zeroconf-ioslave., guix-commits, 2019/12/29
- 30/285: gnu: Add kmousetool., guix-commits, 2019/12/29
- 26/285: gnu: Add grantleetheme., guix-commits, 2019/12/29
- 40/285: gnu: acpica: Update to 20191213., guix-commits, 2019/12/29
- 42/285: gnu: thermald: Update to 1.9.1., guix-commits, 2019/12/29
- 41/285: gnu: fio: Update to 3.17., guix-commits, 2019/12/29
- 24/285: gnu: kdeconnect: Use fixed qt-build-system., guix-commits, 2019/12/29
- 33/285: gnu: Add krusader., guix-commits, 2019/12/29
- 34/285: gnu: Add okteta., guix-commits, 2019/12/29
- 36/285: gnu: Add smb4k., guix-commits, 2019/12/29