[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: squash! build-system: Rewrite using gexps.
From: |
guix-commits |
Subject: |
02/03: squash! build-system: Rewrite using gexps. |
Date: |
Mon, 8 Mar 2021 17:24:50 -0500 (EST) |
civodul pushed a commit to branch wip-build-systems-gexp
in repository guix.
commit eedbee6448ad9d4ecb472a9d530d5f5f66cc6e84
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Mar 8 23:22:14 2021 +0100
squash! build-system: Rewrite using gexps.
---
guix/build-system/meson.scm | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm
index 0d352aa..b9febe4 100644
--- a/guix/build-system/meson.scm
+++ b/guix/build-system/meson.scm
@@ -118,17 +118,16 @@
has a 'meson.build' file."
(define builder
(with-imported-modules imported-modules
- #~(let ((build-phases #$(let ((phases (if (pair? phases)
- (sexp->gexp phases)
- phases)))
- (if glib-or-gtk?
- phases
- #~(modify-phases #$phases
- (delete 'glib-or-gtk-compile-schemas)
- (delete 'glib-or-gtk-wrap))))))
-
+ #~(begin
(use-modules #$@(sexp->gexp modules))
+ (define build-phases
+ #$(if glib-or-gtk?
+ phases
+ #~(modify-phases #$phases
+ (delete 'glib-or-gtk-compile-schemas)
+ (delete 'glib-or-gtk-wrap))))
+
#$(with-build-variables inputs outputs
#~(meson-build #:source #+source
#:system #$system