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

gnu: qemu: Return #t from phases. 

* gnu/packages/virtualization.scm (qemu)[arguments]: Substitute INVOKE
for SYSTEM*.
This commit is contained in:
Tobias Geerinckx-Rice 2018-06-22 17:41:55 +02:00
parent 56d63f8119
commit 642d2db55a
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gnu/packages/virtualization.scm
View File

@ -130,28 +130,27 @@
;; The binaries need to be linked against -lrt. ;; The binaries need to be linked against -lrt.
(setenv "LDFLAGS" "-lrt") (setenv "LDFLAGS" "-lrt")
(zero? (apply invoke
(apply system* `("./configure"
`("./configure" ,(string-append "--cc=" (which "gcc"))
,(string-append "--cc=" (which "gcc")) ;; Some architectures insist on using HOST_CC
;; Some architectures insist on using HOST_CC ,(string-append "--host-cc=" (which "gcc"))
,(string-append "--host-cc=" (which "gcc")) "--disable-debug-info" ; save build space
"--disable-debug-info" ; save build space "--enable-virtfs" ; just to be sure
"--enable-virtfs" ; just to be sure ,(string-append "--prefix=" out)
,(string-append "--prefix=" out) ,(string-append "--sysconfdir=/etc")
,(string-append "--sysconfdir=/etc") ,@configure-flags)))))
,@configure-flags))))))
(add-after 'install 'install-info (add-after 'install 'install-info
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Install the Info manual, unless Texinfo is missing. ;; Install the Info manual, unless Texinfo is missing.
(or (not (assoc-ref inputs "texinfo")) (when (assoc-ref inputs "texinfo")
(let ((out (assoc-ref outputs "out"))) (let* ((out (assoc-ref outputs "out"))
(and (zero? (system* "make" "info")) (dir (string-append out "/share/info")))
(let ((infodir (string-append out "/share/info"))) (invoke "make" "info")
(for-each (lambda (info) (for-each (lambda (info)
(install-file info infodir)) (install-file info dir))
(find-files "." "\\.info")) (find-files "." "\\.info"))))
#t)))))) #t))
;; Create a wrapper for Samba. This allows QEMU to use Samba without ;; 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 ;; pulling it in as an input. Note that you need to explicitly install
;; Samba in your Guix profile for Samba support. ;; Samba in your Guix profile for Samba support.