[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
105/115: build: glib-or-gtk-build-system: Fix indentation.
From: |
guix-commits |
Subject: |
105/115: build: glib-or-gtk-build-system: Fix indentation. |
Date: |
Fri, 15 Oct 2021 09:49:20 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 90fe28175b42ba3125daf2ac82c89d43495921c3
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)
- 86/115: gnu: Add ld-gold-wrapper., (continued)
- 86/115: gnu: Add ld-gold-wrapper., guix-commits, 2021/10/15
- 87/115: gnu: gdb: Patch references to /bin/sh and add debug output., guix-commits, 2021/10/15
- 88/115: gnu: gdb: Normalize indentation., guix-commits, 2021/10/15
- 92/115: gnu: rust: Bootstrap rust from 1.39.0 and optimize build time., guix-commits, 2021/10/15
- 72/115: gnu: libnice: Update to 0.1.18-0.47a9633., guix-commits, 2021/10/15
- 85/115: gnu: make-ld-wrapper: Add a LINKER argument., guix-commits, 2021/10/15
- 102/115: gnu: python-pathlib2: Update to 2.3.6., guix-commits, 2021/10/15
- 108/115: gnu: inkscape: Remove the legacy 0.92 version., guix-commits, 2021/10/15
- 100/115: gnu: python-setuptools-scm: Update to 6.3.2, guix-commits, 2021/10/15
- 101/115: gnu: python-pytest-6: Fix version via setuptools-scm., guix-commits, 2021/10/15
- 105/115: build: glib-or-gtk-build-system: Fix indentation.,
guix-commits <=
- 107/115: gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape., guix-commits, 2021/10/15
- 109/115: gnu: mesa: Update to 21.2.4., guix-commits, 2021/10/15
- 110/115: gnu: graphviz: Update to 2.49.0., guix-commits, 2021/10/15
- 115/115: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/10/15
- 66/115: gnu: gst-editing-services: Update to 1.18.5., guix-commits, 2021/10/15
- 68/115: gnu: gstreamer-docs: Update to 1.18.5., guix-commits, 2021/10/15
- 76/115: gnu: glibc: Look for the current timezone in /etc/localtime., guix-commits, 2021/10/15
- 82/115: build: qt-utils: Don't wrap .X-real files., guix-commits, 2021/10/15
- 89/115: guix: packages: Fix repacking of plain tarballs., guix-commits, 2021/10/15
- 90/115: aux-files: sitecustomize: Cleanup and add explanatory comments., guix-commits, 2021/10/15