[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
104/136: build: glib-or-gtk-build-system: Fix indentation.
From: |
guix-commits |
Subject: |
104/136: build: glib-or-gtk-build-system: Fix indentation. |
Date: |
Sun, 17 Oct 2021 05:16:17 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 307d99986e06fc9df3429a7878f4b925c61de026
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)
- 100/136: gnu: python-pytest-6: Fix version via setuptools-scm., (continued)
- 100/136: gnu: python-pytest-6: Fix version via setuptools-scm., guix-commits, 2021/10/17
- 99/136: gnu: python-setuptools-scm: Update to 6.3.2, guix-commits, 2021/10/17
- 115/136: gnu: inkscape: Remove the legacy 0.92 version., guix-commits, 2021/10/17
- 105/136: gnu: at-spi2-core: Reverse inheritance relationship with minimal variant., guix-commits, 2021/10/17
- 116/136: gnu: mesa: Update to 21.2.4., guix-commits, 2021/10/17
- 126/136: gnu: glib-networking: Update to 2.70.rc., guix-commits, 2021/10/17
- 136/136: gnu: gtk: Deprecate gdk-pixbuf+svg in favor of librsvg., guix-commits, 2021/10/17
- 36/136: gnu: python-sphinxcontrib-htmlhelp: Update to 2.0.0., guix-commits, 2021/10/17
- 101/136: gnu: python-pathlib2: Update to 2.3.6., guix-commits, 2021/10/17
- 114/136: gnu: rest: Use libsoup-minimal., guix-commits, 2021/10/17
- 104/136: build: glib-or-gtk-build-system: Fix indentation.,
guix-commits <=
- 112/136: gnu: libcloudproviders-minimal: Introduce minimal variant., guix-commits, 2021/10/17
- 122/136: gnu: heimdal: Fix build., guix-commits, 2021/10/17
- 130/136: gnu: webkitgtk: Update to 2.34.0., guix-commits, 2021/10/17
- 127/136: gnu: vala: Update to 0.54.2., guix-commits, 2021/10/17
- 63/136: gnu: gst-plugins-bad: Update to 1.18.5., guix-commits, 2021/10/17
- 110/136: gnu: Add docbook-xsl-ns., guix-commits, 2021/10/17
- 109/136: gnu: json-glib-minimal: Introduce minimal variant., guix-commits, 2021/10/17
- 121/136: gnu: util-linux: Globally disable the lsns test., guix-commits, 2021/10/17
- 66/136: gnu: gst-editing-services: Update to 1.18.5., guix-commits, 2021/10/17
- 80/136: gnu: diffutils: Update to 3.8., guix-commits, 2021/10/17