From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 51428@debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#51428] [PATCH core-update-frozen 02/13] build: glib-or-gtk-build-system: Fix indentation.
Date: Wed, 27 Oct 2021 00:51:33 -0400 [thread overview]
Message-ID: <20211027045151.9889-2-maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com>
* 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 655f20cd12..c2f814eaeb 100644
--- a/guix/build/glib-or-gtk-build-system.scm
+++ b/guix/build/glib-or-gtk-build-system.scm
@@ -63,9 +63,9 @@ (define (gtk-module-directories inputs)
""))
"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 @@ (define %sh (delay (search-input-file inputs "bin/bash")))
(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)
--
2.33.1
next prev parent reply other threads:[~2021-10-27 4:54 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-27 4:04 [bug#51428] core-updates-frozen-batched-changes built and ready to merge Maxim Cournoyer
2021-10-27 4:51 ` [bug#51428] [PATCH core-update-frozen 01/13] build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase Maxim Cournoyer
2021-10-27 4:51 ` Maxim Cournoyer [this message]
2021-10-27 4:51 ` [bug#51428] [PATCH core-update-frozen 03/13] gnu: at-spi2-core: Reverse inheritance relationship with minimal variant Maxim Cournoyer
2021-10-27 4:51 ` [bug#51428] [PATCH core-update-frozen 04/13] gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape Maxim Cournoyer
2021-10-27 4:51 ` [bug#51428] [PATCH core-update-frozen 05/13] gnu: lsof: Disable the LTlock test Maxim Cournoyer
2021-10-27 4:51 ` [bug#51428] [PATCH core-update-frozen 06/13] gnu: lsof: Fix indentation Maxim Cournoyer
2021-10-27 4:51 ` [bug#51428] [PATCH core-update-frozen 07/13] gnu: json-glib-minimal: Introduce minimal variant Maxim Cournoyer
2021-10-27 4:51 ` [bug#51428] [PATCH core-update-frozen 08/13] gnu: Add docbook-xsl-ns Maxim Cournoyer
2021-10-27 4:51 ` [bug#51428] [PATCH core-update-frozen 09/13] gnu: colord-minimal: Introduce minimal variant Maxim Cournoyer
2021-10-27 4:51 ` [bug#51428] [PATCH core-update-frozen 10/13] gnu: libcloudproviders-minimal: " Maxim Cournoyer
2021-10-27 4:51 ` [bug#51428] [PATCH core-update-frozen 11/13] gnu: gusb-minimal: " Maxim Cournoyer
2021-10-27 4:51 ` [bug#51428] [PATCH core-update-frozen 12/13] gnu: rest: Use libsoup-minimal Maxim Cournoyer
2021-10-27 4:51 ` [bug#51428] [PATCH core-update-frozen 13/13] gnu: inkscape: Remove the legacy 0.92 version Maxim Cournoyer
2021-10-27 4:51 ` [bug#51428] [PATCH core-update-frozen 14/20] gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper Maxim Cournoyer
2021-10-27 4:51 ` [bug#51428] [PATCH core-update-frozen 15/20] gnu: gtk: Add the generate-gdk-pixbuf-loaders-cache-file phase Maxim Cournoyer
2021-10-27 4:51 ` [bug#51428] [PATCH core-update-frozen 16/20] build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file in a phase Maxim Cournoyer
2021-10-27 14:48 ` [bug#51428] core-updates-frozen-batched-changes built and ready to merge Ludovic Courtès
2021-10-27 18:00 ` Maxim Cournoyer
2021-10-27 4:51 ` [bug#51428] [PATCH core-update-frozen 17/20] profiles: Add a gdk-pixbuf-loaders-cache-file hook Maxim Cournoyer
2021-10-27 14:45 ` [bug#51428] core-updates-frozen-batched-changes built and ready to merge Ludovic Courtès
2021-10-27 17:51 ` Maxim Cournoyer
2021-10-27 4:51 ` [bug#51428] [PATCH core-update-frozen 18/20] gnu: gdk-pixbuf: Add a search path for the loaders cache file Maxim Cournoyer
2021-10-27 4:51 ` [bug#51428] [PATCH core-update-frozen 19/20] gnu: gtk: Replace gdk-pixbuf+svg by librsvg Maxim Cournoyer
2021-10-27 4:51 ` [bug#51428] [PATCH core-update-frozen 20/20] gnu: librsvg: Preserve the loaders.cache file Maxim Cournoyer
2021-10-27 14:51 ` [bug#51428] core-updates-frozen-batched-changes built and ready to merge Ludovic Courtès
2021-10-27 14:52 ` Thiago Jung Bauermann via Guix-patches via
2021-10-27 15:37 ` Maxim Cournoyer
2021-10-27 16:26 ` Thiago Jung Bauermann via Guix-patches via
2021-10-29 4:26 ` Thiago Jung Bauermann via Guix-patches via
2021-10-29 20:10 ` Maxim Cournoyer
2021-10-29 21:18 ` Thiago Jung Bauermann via Guix-patches via
2021-11-03 2:37 ` Thiago Jung Bauermann via Guix-patches via
2021-11-05 5:06 ` Maxim Cournoyer
2021-11-12 0:35 ` Thiago Jung Bauermann via Guix-patches via
2021-11-12 5:29 ` bug#51428: " Maxim Cournoyer
2021-10-31 16:30 ` [bug#51428] " Guillaume Le Vaillant
2021-10-31 21:11 ` Maxim Cournoyer
2021-11-03 10:24 ` zimoun
2021-11-03 13:38 ` Thiago Jung Bauermann via Guix-patches via
2021-11-05 4:57 ` Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211027045151.9889-2-maxim.cournoyer@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=51428@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.