From 642d2db55a9adcf9ed94d283c84ad94e2c33cedf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Jun 2018 17:41:55 +0200 Subject: gnu: qemu: Return #t from phases. * gnu/packages/virtualization.scm (qemu)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/virtualization.scm | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index e0c48ba260..ebc57dc369 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -130,28 +130,27 @@ ;; The binaries need to be linked against -lrt. (setenv "LDFLAGS" "-lrt") - (zero? - (apply system* - `("./configure" - ,(string-append "--cc=" (which "gcc")) - ;; Some architectures insist on using HOST_CC - ,(string-append "--host-cc=" (which "gcc")) - "--disable-debug-info" ; save build space - "--enable-virtfs" ; just to be sure - ,(string-append "--prefix=" out) - ,(string-append "--sysconfdir=/etc") - ,@configure-flags)))))) + (apply invoke + `("./configure" + ,(string-append "--cc=" (which "gcc")) + ;; Some architectures insist on using HOST_CC + ,(string-append "--host-cc=" (which "gcc")) + "--disable-debug-info" ; save build space + "--enable-virtfs" ; just to be sure + ,(string-append "--prefix=" out) + ,(string-append "--sysconfdir=/etc") + ,@configure-flags))))) (add-after 'install 'install-info (lambda* (#:key inputs outputs #:allow-other-keys) ;; Install the Info manual, unless Texinfo is missing. - (or (not (assoc-ref inputs "texinfo")) - (let ((out (assoc-ref outputs "out"))) - (and (zero? (system* "make" "info")) - (let ((infodir (string-append out "/share/info"))) - (for-each (lambda (info) - (install-file info infodir)) - (find-files "." "\\.info")) - #t)))))) + (when (assoc-ref inputs "texinfo") + (let* ((out (assoc-ref outputs "out")) + (dir (string-append out "/share/info"))) + (invoke "make" "info") + (for-each (lambda (info) + (install-file info dir)) + (find-files "." "\\.info")))) + #t)) ;; Create a wrapper for Samba. This allows QEMU to use Samba without ;; pulling it in as an input. Note that you need to explicitly install ;; Samba in your Guix profile for Samba support. -- cgit v1.2.3