[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
104/115: build: glib-or-gtk-build-system: Simplify the wrap-all-programs
From: |
guix-commits |
Subject: |
104/115: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase. |
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 f75b8013bf23554d3969206d7ba094b75c8bc2b1
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)
- 115/115: gnu: mit-krb5: Absorb 1.19.2 graft., (continued)
- 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
- 91/115: gnu: glade3: Remove sitecustomize.py workaround., guix-commits, 2021/10/15
- 93/115: gnu: rust: Add rust 1.54 and move all non-bootstrapping logic to it., guix-commits, 2021/10/15
- 97/115: gnu: python-pypa-build: Update to 0.7.0., guix-commits, 2021/10/15
- 104/115: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase.,
guix-commits <=
- 62/115: gnu: gst-plugins-good: Update to 1.18.5., guix-commits, 2021/10/15
- 94/115: gnu: Build all Rust packages using the latest rustc., guix-commits, 2021/10/15
- 95/115: gnu: fontconfig: Add a search path for XDG_DATA_DIRS., guix-commits, 2021/10/15
- 96/115: gnu: Move a few Python packages to (gnu packages python-build)., guix-commits, 2021/10/15
- 98/115: gnu: Add python-flit-core., guix-commits, 2021/10/15
- 106/115: gnu: at-spi2-core: Reverse inheritance relationship with minimal variant., guix-commits, 2021/10/15
- 112/115: gnu: lsof: Fix indentation., guix-commits, 2021/10/15
- 114/115: gnu: openssl: Absorb 1.1.1l graft., guix-commits, 2021/10/15
- 111/115: gnu: lsof: Disable the LTlock test., guix-commits, 2021/10/15
- 113/115: gnu: cmake-bootstrap: Update to 3.21.3., guix-commits, 2021/10/15