guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/30: build-system/glib-or-gtk: Use invoke instead of system*.


From: Mark H. Weaver
Subject: 04/30: build-system/glib-or-gtk: Use invoke instead of system*.
Date: Fri, 16 Mar 2018 05:03:35 -0400 (EDT)

mhw pushed a commit to branch core-updates
in repository guix.

commit 09a8f68b11a8f2ab8736d853ac2ed81b57483ae6
Author: Mark H Weaver <address@hidden>
Date:   Fri Mar 16 02:48:20 2018 -0400

    build-system/glib-or-gtk: Use invoke instead of system*.
    
    * guix/build/glib-or-gtk-build-system.scm (compile-glib-schemas): Use invoke
    and remove vestigial plumbing.
---
 guix/build/glib-or-gtk-build-system.scm | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/guix/build/glib-or-gtk-build-system.scm 
b/guix/build/glib-or-gtk-build-system.scm
index b6291e7..ba680fd 100644
--- a/guix/build/glib-or-gtk-build-system.scm
+++ b/guix/build/glib-or-gtk-build-system.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 Federico Beffa <address@hidden>
 ;;; Copyright © 2014, 2015 Ludovic Courtès <address@hidden>
+;;; Copyright © 2018 Mark H Weaver <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -202,16 +203,16 @@ add a dependency of that output on GLib and GTK+."
 (define* (compile-glib-schemas #:key outputs #:allow-other-keys)
   "Implement phase \"glib-or-gtk-compile-schemas\": compile \"glib\" schemas
 if needed."
-  (every (match-lambda
-          ((output . directory)
-           (let ((schemasdir (string-append directory
-                                            "/share/glib-2.0/schemas")))
-             (if (and (directory-exists? schemasdir)
-                      (not (file-exists?
-                            (string-append schemasdir "/gschemas.compiled"))))
-                 (zero? (system* "glib-compile-schemas" schemasdir))
-                 #t))))
-         outputs))
+  (for-each (match-lambda
+              ((output . directory)
+               (let ((schemasdir (string-append directory
+                                                "/share/glib-2.0/schemas")))
+                 (when (and (directory-exists? schemasdir)
+                            (not (file-exists?
+                                  (string-append schemasdir 
"/gschemas.compiled"))))
+                   (invoke "glib-compile-schemas" schemasdir)))))
+            outputs)
+  #t)
 
 (define %standard-phases
   (modify-phases gnu:%standard-phases



reply via email to

[Prev in Thread] Current Thread [Next in Thread]