[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
104/227: build: glib-or-gtk-build-system: Fix indentation.
From: |
guix-commits |
Subject: |
104/227: build: glib-or-gtk-build-system: Fix indentation. |
Date: |
Thu, 11 Nov 2021 12:30:16 -0500 (EST) |
apteryx pushed a commit to branch core-updates-frozen
in repository guix.
commit 889eebc1854145e6895bb8b50fc36d07a194c1fb
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)
- 88/227: guix: packages: Fix repacking of plain tarballs., (continued)
- 88/227: guix: packages: Fix repacking of plain tarballs., guix-commits, 2021/11/11
- 90/227: gnu: glade3: Remove sitecustomize.py workaround., guix-commits, 2021/11/11
- 91/227: gnu: rust: Bootstrap rust from 1.39.0 and optimize build time., guix-commits, 2021/11/11
- 92/227: gnu: rust: Add rust 1.54 and move all non-bootstrapping logic to it., guix-commits, 2021/11/11
- 94/227: gnu: fontconfig: Add a search path for XDG_DATA_DIRS., guix-commits, 2021/11/11
- 95/227: gnu: Move a few Python packages to (gnu packages python-build)., guix-commits, 2021/11/11
- 96/227: gnu: python-pypa-build: Update to 0.7.0., guix-commits, 2021/11/11
- 100/227: gnu: python-pytest-6: Fix version via setuptools-scm., guix-commits, 2021/11/11
- 97/227: gnu: Add python-flit-core., guix-commits, 2021/11/11
- 102/227: gnu: meson: Patch to allow installing to independent prefixes., guix-commits, 2021/11/11
- 104/227: build: glib-or-gtk-build-system: Fix indentation.,
guix-commits <=
- 108/227: gnu: lsof: Fix indentation., guix-commits, 2021/11/11
- 110/227: gnu: Add docbook-xsl-ns., guix-commits, 2021/11/11
- 111/227: gnu: colord-minimal: Introduce minimal variant., guix-commits, 2021/11/11
- 113/227: gnu: gusb-minimal: Introduce minimal variant., guix-commits, 2021/11/11
- 121/227: gnu: util-linux: Globally disable the lsns test., guix-commits, 2021/11/11
- 131/227: gnu: pulseaudio: Add doxygen to fix build., guix-commits, 2021/11/11
- 134/227: gnu: llvm: Add make-lld-wrapper, lld-wrapper and lld-as-ld-wrapper., guix-commits, 2021/11/11
- 117/227: gnu: graphviz: Update to 2.49.0., guix-commits, 2021/11/11
- 119/227: gnu: openssl: Absorb 1.1.1l graft., guix-commits, 2021/11/11
- 125/227: gnu: glib: Update to 2.70, specify a bindir prefix and hide package., guix-commits, 2021/11/11