nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Mark H Weaver 2018-03-16 02:48:20 -04:00
parent 9a87649c86
commit 09a8f68b11
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
guix/build/glib-or-gtk-build-system.scm
View File

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2014 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; 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) (define* (compile-glib-schemas #:key outputs #:allow-other-keys)
"Implement phase \"glib-or-gtk-compile-schemas\": compile \"glib\" schemas "Implement phase \"glib-or-gtk-compile-schemas\": compile \"glib\" schemas
if needed." if needed."
(every (match-lambda (for-each (match-lambda
((output . directory) ((output . directory)
(let ((schemasdir (string-append directory (let ((schemasdir (string-append directory
"/share/glib-2.0/schemas"))) "/share/glib-2.0/schemas")))
(if (and (directory-exists? schemasdir) (when (and (directory-exists? schemasdir)
(not (file-exists? (not (file-exists?
(string-append schemasdir "/gschemas.compiled")))) (string-append schemasdir "/gschemas.compiled"))))
(zero? (system* "glib-compile-schemas" schemasdir)) (invoke "glib-compile-schemas" schemasdir)))))
#t)))) outputs)
outputs)) #t)
(define %standard-phases (define %standard-phases
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases