branch wip-build-systems-gexp updated: squash! build-system: Rewrite using gexps.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch wip-build-systems-gexp
in repository guix.

The following commit(s) were added to refs/heads/wip-build-systems-gexp by this 
push:
     new 5d288ef  squash! build-system: Rewrite using gexps.
5d288ef is described below

commit 5d288efd7d51c8d74938c47438c36c2ed049bd1b
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Tue Mar 9 10:42:03 2021 +0100

    squash! build-system: Rewrite using gexps.
---
 guix/build-system/guile.scm | 23 ++++++-----------------
 guix/build-system/qt.scm    |  9 ++++++---
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/guix/build-system/guile.scm b/guix/build-system/guile.scm
index fe0bf0b..f64f214 100644
--- a/guix/build-system/guile.scm
+++ b/guix/build-system/guile.scm
@@ -104,13 +104,8 @@
                        #:compile-flags #$compile-flags
                        #:phases #$phases
                        #:system #$system
-                       #:outputs (list #$@(map (lambda (name)
-                                                 #~(cons #$name
-                                                         (ungexp output name)))
-                                               outputs))
-                       #:inputs (map (lambda (tuple)
-                                       (apply cons tuple))
-                                     '#$inputs)
+                       #:outputs #$(outputs->gexp outputs)
+                       #:inputs #$(input-tuples->gexp inputs)
                        #:search-paths '#$(map search-path-specification->sexp
                                               search-paths)))))
 
@@ -144,20 +139,14 @@
           (use-modules #$@modules)
 
           (define %build-host-inputs
-            (map (lambda (tuple)
-                   (apply cons tuple))
-                 '#+(append build-inputs target-inputs)))
+            #+(input-tuples->gexp build-inputs))
 
           (define %build-target-inputs
-            (map (lambda (tuple)
-                   (apply cons tuple))
-                 '#$host-inputs))
+            (append #$(input-tuples->gexp host-inputs)
+                    #+(input-tuples->gexp target-inputs)))
 
           (define %outputs
-            (list #$@(map (lambda (name)
-                            #~(cons #$name
-                                    (ungexp output name)))
-                          outputs)))
+            #$(outputs->gexp outputs))
 
           (guile-build #:source #+source
                        #:system #$system
diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm
index 894d2a6..063fa7b 100644
--- a/guix/build-system/qt.scm
+++ b/guix/build-system/qt.scm
@@ -137,8 +137,8 @@ provides a 'CMakeLists.txt' file as its build system."
           (use-modules #$@(sexp->gexp modules))
           (qt-build #:source #+source
                     #:system #$system
-                    #:outputs %outputs
-                    #:inputs %build-inputs
+                    #:outputs #$(outputs->gexp outputs)
+                    #:inputs #$(input-tuples->gexp inputs)
                     #:search-paths '#$(sexp->gexp
                                        (map search-path-specification->sexp
                                             search-paths))
@@ -212,11 +212,14 @@ build system."
             (append #$(input-tuples->gexp host-inputs)
                     #+(input-tuples->gexp target-inputs)))
 
+          (define %outputs
+            #$(outputs->gexp outputs))
+
           (qt-build #:source #+source
                     #:system #$system
                     #:build #$build
                     #:target #$target
-                    #:outputs #$(outputs->gexp outputs)
+                    #:outputs %outputs
                     #:inputs %build-target-inputs
                     #:native-inputs %build-host-inputs
                     #:search-paths '#$(sexp->gexp