[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
103/136: build: glib-or-gtk-build-system: Simplify the wrap-all-programs
From: |
guix-commits |
Subject: |
103/136: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase. |
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 fdb60c572858c838c6a6a4f174d4d6be78152887
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Oct 3 21:11:37 2021 -0400
build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase.
* guix/build/glib-or-gtk-build-system.scm (wrap-all-programs)
<handle-output>: Precisely build the list of variable specifications, rather
than relying on a bunch of conditionals.
---
guix/build/glib-or-gtk-build-system.scm | 59 ++++++++-------------------------
1 file changed, 13 insertions(+), 46 deletions(-)
diff --git a/guix/build/glib-or-gtk-build-system.scm
b/guix/build/glib-or-gtk-build-system.scm
index 9f4cc09..655f20c 100644
--- a/guix/build/glib-or-gtk-build-system.scm
+++ b/guix/build/glib-or-gtk-build-system.scm
@@ -169,52 +169,19 @@ add a dependency of that output on GLib and GTK+."
(alist-cons output directory inputs)))
(gio-mod-dirs (gio-module-directories
(alist-cons output directory inputs)))
- (data-env-var
- (if (not (null? datadirs))
- `("XDG_DATA_DIRS" ":" prefix ,datadirs)
- #f))
- (gtk-mod-env-var
- (if (not (null? gtk-mod-dirs))
- `("GTK_PATH" ":" prefix ,gtk-mod-dirs)
- #f))
- (gio-mod-env-var
- (if (not (null? gio-mod-dirs))
- `("GIO_EXTRA_MODULES" ":" prefix ,gio-mod-dirs)
- #f)))
- (cond
- ((and data-env-var gtk-mod-env-var gio-mod-env-var)
- (for-each (cut wrap-program <> #:sh (sh)
- data-env-var
- gtk-mod-env-var
- gio-mod-env-var)
- bin-list))
- ((and data-env-var gtk-mod-env-var (not gio-mod-env-var))
- (for-each (cut wrap-program <> #:sh (sh)
- data-env-var
- gtk-mod-env-var)
- bin-list))
- ((and data-env-var (not gtk-mod-env-var) gio-mod-env-var)
- (for-each (cut wrap-program <> #:sh (sh)
- data-env-var
- gio-mod-env-var)
- bin-list))
- ((and (not data-env-var) gtk-mod-env-var gio-mod-env-var)
- (for-each (cut wrap-program <> #:sh (sh)
- gio-mod-env-var
- gtk-mod-env-var)
- bin-list))
- ((and data-env-var (not gtk-mod-env-var) (not gio-mod-env-var))
- (for-each (cut wrap-program <> #:sh (sh)
- data-env-var)
- bin-list))
- ((and (not data-env-var) gtk-mod-env-var (not gio-mod-env-var))
- (for-each (cut wrap-program <> #:sh (sh)
- gtk-mod-env-var)
- bin-list))
- ((and (not data-env-var) (not gtk-mod-env-var) gio-mod-env-var)
- (for-each (cut wrap-program <> #:sh (sh)
- gio-mod-env-var)
- bin-list))))))))
+ (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)
- 107/136: gnu: lsof: Disable the LTlock test., (continued)
- 107/136: gnu: lsof: Disable the LTlock test., guix-commits, 2021/10/17
- 65/136: gnu: gst-libav: Update to 1.18.5., guix-commits, 2021/10/17
- 76/136: gnu: glibc: Look for the current timezone in /etc/localtime., guix-commits, 2021/10/17
- 72/136: gnu: libnice: Update to 0.1.18-0.47a9633., guix-commits, 2021/10/17
- 78/136: gnu: gtk+-2: Fix ‘builder’ test., guix-commits, 2021/10/17
- 81/136: build: qt-utils: Don't wrap .X-real files., guix-commits, 2021/10/17
- 84/136: gnu: make-ld-wrapper: Add a LINKER argument., guix-commits, 2021/10/17
- 85/136: gnu: Add ld-gold-wrapper., guix-commits, 2021/10/17
- 88/136: guix: packages: Fix repacking of plain tarballs., guix-commits, 2021/10/17
- 108/136: gnu: lsof: Fix indentation., guix-commits, 2021/10/17
- 103/136: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase.,
guix-commits <=
- 117/136: gnu: graphviz: Update to 2.49.0., guix-commits, 2021/10/17
- 106/136: gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape., guix-commits, 2021/10/17
- 102/136: gnu: meson: Patch to allow installing to independent prefixes., guix-commits, 2021/10/17
- 128/136: gnu: libsoup: Reverse inheritance relationship with libsoup-minimal., guix-commits, 2021/10/17
- 119/136: gnu: openssl: Absorb 1.1.1l graft., guix-commits, 2021/10/17
- 124/136: gnu: libthai: Make datrie a normal native-input., guix-commits, 2021/10/17
- 68/136: gnu: gstreamer-docs: Update to 1.18.5., guix-commits, 2021/10/17
- 75/136: gnu: glibc: Remove unneeded nscd patching., guix-commits, 2021/10/17
- 91/136: gnu: rust: Bootstrap rust from 1.39.0 and optimize build time., guix-commits, 2021/10/17
- 120/136: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/10/17