03/03: squash! build-system: Use 'sexp->gexp' for plain sexps.

[guix-commits]

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

commit ef23aa8a3068a1ed89ef2b31fb6d626c5ff7b6ef
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Mar 8 23:21:13 2021 +0100

    squash! build-system: Use 'sexp->gexp' for plain sexps.
---
 guix/build-system/android-ndk.scm |  4 ++--
 guix/build-system/cmake.scm       |  4 ++--
 guix/build-system/meson.scm       | 11 ++++++-----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/guix/build-system/android-ndk.scm 
b/guix/build-system/android-ndk.scm
index 4173590..fa8b1e2 100644
--- a/guix/build-system/android-ndk.scm
+++ b/guix/build-system/android-ndk.scm
@@ -69,8 +69,8 @@
                                                    
"/share/android/build/core/main.mk")
                                     #$make-flags)
                              #:outputs #$(outputs->gexp outputs)
-                             #:search-paths '(sexp->gexp
-                                              #$(map 
search-path-specification->sexp
+                             #:search-paths '#$(sexp->gexp
+                                                (map 
search-path-specification->sexp
                                                      search-paths))
                              #:inputs #$(input-tuples->gexp inputs)))))
 
diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm
index 1ac9e98..2f9689b 100644
--- a/guix/build-system/cmake.scm
+++ b/guix/build-system/cmake.scm
@@ -131,8 +131,8 @@ provides a 'CMakeLists.txt' file as its build system."
                              #:system #$system
                              #:outputs %outputs
                              #:inputs %build-inputs
-                             #:search-paths '(sexp->gexp
-                                              #$(map 
search-path-specification->sexp
+                             #:search-paths '#$(sexp->gexp
+                                                (map 
search-path-specification->sexp
                                                      search-paths))
                              #:phases #$(if (pair? phases)
                                             (sexp->gexp phases)
diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm
index b9febe4..5adc0f9 100644
--- a/guix/build-system/meson.scm
+++ b/guix/build-system/meson.scm
@@ -122,11 +122,12 @@ has a 'meson.build' file."
           (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))))
+            #$(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)))))
 
           #$(with-build-variables inputs outputs
               #~(meson-build #:source #+source