[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
103/142: build: glib-or-gtk-build-system: Simplify the wrap-all-programs
From: |
guix-commits |
Subject: |
103/142: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase. |
Date: |
Wed, 20 Oct 2021 14:56:52 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 3d163b3095a7a6637ca35b9723de10f85f70ca36
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)
- 56/142: gnu: mozjs-78: Update to 78.13.0., (continued)
- 56/142: gnu: mozjs-78: Update to 78.13.0., guix-commits, 2021/10/20
- 59/142: Revert gstreamer update to 1.19.2., guix-commits, 2021/10/20
- 64/142: gnu: gst-plugins-ugly: Update to 1.18.5., guix-commits, 2021/10/20
- 71/142: gnu: dbus-c++: Fix build., guix-commits, 2021/10/20
- 65/142: gnu: gst-libav: Update to 1.18.5., guix-commits, 2021/10/20
- 74/142: gnu: python-keras: Skip a flaky test., guix-commits, 2021/10/20
- 75/142: gnu: glibc: Remove unneeded nscd patching., guix-commits, 2021/10/20
- 80/142: gnu: diffutils: Update to 3.8., guix-commits, 2021/10/20
- 87/142: gnu: gdb: Normalize indentation., guix-commits, 2021/10/20
- 83/142: gnu: gcc-5: Fix powerpc64le-linux build, guix-commits, 2021/10/20
- 103/142: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase.,
guix-commits <=
- 97/142: gnu: Add python-flit-core., guix-commits, 2021/10/20
- 84/142: gnu: make-ld-wrapper: Add a LINKER argument., guix-commits, 2021/10/20
- 99/142: gnu: python-setuptools-scm: Update to 6.3.2, guix-commits, 2021/10/20
- 03/142: gnu: rust: Update to 1.50., guix-commits, 2021/10/20
- 19/142: gnu: gstreamer: Update to 1.18.4., guix-commits, 2021/10/20
- 32/142: gnu: python-docutils: Update to 0.17.1., guix-commits, 2021/10/20
- 33/142: gnu: bluez: Update to 5.59., guix-commits, 2021/10/20
- 35/142: gnu: gnupg: Update to 2.2.30., guix-commits, 2021/10/20
- 37/142: gnu: python-sphinxcontrib-serializinghtml: Update to 1.1.5., guix-commits, 2021/10/20
- 51/142: gnu: pulseaudio: Update to 15.0., guix-commits, 2021/10/20