[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
104/149: build: glib-or-gtk-build-system: Fix indentation.
From: |
guix-commits |
Subject: |
104/149: build: glib-or-gtk-build-system: Fix indentation. |
Date: |
Tue, 26 Oct 2021 23:52:32 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 605a9bbdb90c793abcaa37f78f9969e8ac54857d
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Oct 3 21:13:43 2021 -0400
build: glib-or-gtk-build-system: Fix indentation.
* guix/build/glib-or-gtk-build-system.scm (gtk-module-directories)
(wrap-all-programs): Fix indentation.
---
guix/build/glib-or-gtk-build-system.scm | 58 ++++++++++++++++-----------------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/guix/build/glib-or-gtk-build-system.scm
b/guix/build/glib-or-gtk-build-system.scm
index 655f20c..c2f814e 100644
--- a/guix/build/glib-or-gtk-build-system.scm
+++ b/guix/build/glib-or-gtk-build-system.scm
@@ -63,9 +63,9 @@ with all found directories."
""))
"3.0")
((string-match "gtk\\+-2"
- (or (assoc-ref inputs "gtk+")
- (assoc-ref inputs "source")
- ""))
+ (or (assoc-ref inputs "gtk+")
+ (assoc-ref inputs "source")
+ ""))
"2.0")
(else
"4.0"))) ; We default to version 4.0.
@@ -156,32 +156,32 @@ add a dependency of that output on GLib and GTK+."
(define (sh) (force %sh))
(define handle-output
(match-lambda
- ((output . directory)
- (unless (member output glib-or-gtk-wrap-excluded-outputs)
- (let* ((bindir (string-append directory "/bin"))
- (libexecdir (string-append directory "/libexec"))
- (bin-list (filter (negate wrapped-program?)
- (append (find-files bindir ".*")
- (find-files libexecdir ".*"))))
- (datadirs (data-directories
- (alist-cons output directory inputs)))
- (gtk-mod-dirs (gtk-module-directories
- (alist-cons output directory inputs)))
- (gio-mod-dirs (gio-module-directories
- (alist-cons output directory inputs)))
- (env-vars `(,@(if (not (null? datadirs))
- (list `("XDG_DATA_DIRS" ":" prefix ,datadirs))
- '())
- ,@(if (not (null? gtk-mod-dirs))
- (list `("GTK_PATH" ":" prefix ,gtk-mod-dirs))
- '())
- ,@(if (not (null? gio-mod-dirs))
- (list `("GIO_EXTRA_MODULES" ":"
- prefix ,gio-mod-dirs))
- '()))))
- (for-each (lambda (program)
- (apply wrap-program program #:sh (sh) env-vars))
- bin-list))))))
+ ((output . directory)
+ (unless (member output glib-or-gtk-wrap-excluded-outputs)
+ (let* ((bindir (string-append directory "/bin"))
+ (libexecdir (string-append directory "/libexec"))
+ (bin-list (filter (negate wrapped-program?)
+ (append (find-files bindir ".*")
+ (find-files libexecdir ".*"))))
+ (datadirs (data-directories
+ (alist-cons output directory inputs)))
+ (gtk-mod-dirs (gtk-module-directories
+ (alist-cons output directory inputs)))
+ (gio-mod-dirs (gio-module-directories
+ (alist-cons output directory inputs)))
+ (env-vars `(,@(if (not (null? datadirs))
+ (list `("XDG_DATA_DIRS" ":" prefix
,datadirs))
+ '())
+ ,@(if (not (null? gtk-mod-dirs))
+ (list `("GTK_PATH" ":" prefix ,gtk-mod-dirs))
+ '())
+ ,@(if (not (null? gio-mod-dirs))
+ (list `("GIO_EXTRA_MODULES" ":"
+ prefix ,gio-mod-dirs))
+ '()))))
+ (for-each (lambda (program)
+ (apply wrap-program program #:sh (sh) env-vars))
+ bin-list))))))
(for-each handle-output outputs)
#t)
- 77/149: gnu: tzdata: Update to 2021c., (continued)
- 77/149: gnu: tzdata: Update to 2021c., guix-commits, 2021/10/26
- 80/149: gnu: diffutils: Update to 3.8., guix-commits, 2021/10/26
- 85/149: gnu: Add ld-gold-wrapper., guix-commits, 2021/10/26
- 86/149: gnu: gdb: Patch references to /bin/sh and add debug output., guix-commits, 2021/10/26
- 89/149: aux-files: sitecustomize: Cleanup and add explanatory comments., guix-commits, 2021/10/26
- 90/149: gnu: glade3: Remove sitecustomize.py workaround., guix-commits, 2021/10/26
- 94/149: gnu: fontconfig: Add a search path for XDG_DATA_DIRS., guix-commits, 2021/10/26
- 98/149: gnu: Add python-tomli., guix-commits, 2021/10/26
- 99/149: gnu: python-setuptools-scm: Update to 6.3.2, guix-commits, 2021/10/26
- 102/149: gnu: meson: Patch to allow installing to independent prefixes., guix-commits, 2021/10/26
- 104/149: build: glib-or-gtk-build-system: Fix indentation.,
guix-commits <=
- 105/149: gnu: at-spi2-core: Reverse inheritance relationship with minimal variant., guix-commits, 2021/10/26
- 107/149: gnu: lsof: Disable the LTlock test., guix-commits, 2021/10/26
- 109/149: gnu: json-glib-minimal: Introduce minimal variant., guix-commits, 2021/10/26
- 111/149: gnu: colord-minimal: Introduce minimal variant., guix-commits, 2021/10/26
- 121/149: gnu: util-linux: Globally disable the lsns test., guix-commits, 2021/10/26
- 117/149: gnu: graphviz: Update to 2.49.0., guix-commits, 2021/10/26
- 122/149: gnu: heimdal: Fix build., guix-commits, 2021/10/26
- 120/149: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/10/26
- 129/149: gnu: libsoup: Update to 3.0.1., guix-commits, 2021/10/26
- 135/149: gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper., guix-commits, 2021/10/26