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

gnu: qemu: Use 'modify-phases'. 

* gnu/packages/qemu.scm (qemu)[arguments]: Use 'modify-phases'.
This commit is contained in:
Ludovic Courtès 2016-05-26 23:39:46 +02:00
parent 219b45567a
commit 05051e8bb1
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 43 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gnu/packages/qemu.scm
View File

@ -69,8 +69,9 @@
;; boot_sector_test: assertion failed (signature == SIGNATURE): (0x00000000 == 0x0000dead) ;; boot_sector_test: assertion failed (signature == SIGNATURE): (0x00000000 == 0x0000dead)
#:parallel-tests? #f #:parallel-tests? #f
#:phases (alist-replace #:phases
'configure (modify-phases %standard-phases
(replace 'configure
(lambda* (#:key inputs outputs (configure-flags '()) (lambda* (#:key inputs outputs (configure-flags '())
#:allow-other-keys) #:allow-other-keys)
;; The `configure' script doesn't understand some of the ;; The `configure' script doesn't understand some of the
@ -91,9 +92,8 @@
"--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)
,@configure-flags))))) ,@configure-flags))))))
(alist-cons-after (add-after 'install 'install-info
'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")) (or (not (assoc-ref inputs "texinfo"))
@ -106,18 +106,15 @@
info info
(string-append infodir "/" info))) (string-append infodir "/" info)))
(find-files "." "\\.info$")) (find-files "." "\\.info$"))
#t))))) #t))))))
(alist-cons-before (add-before 'check 'disable-test-qga
'check 'disable-test-qga
(lambda _ (lambda _
(substitute* "tests/Makefile" (substitute* "tests/Makefile"
;; Comment out the test-qga test, which needs /sys and ;; Comment out the test-qga test, which needs /sys and
;; fails within the build environment. ;; fails within the build environment.
(("check-unit-.* tests/test-qga" all) (("check-unit-.* tests/test-qga" all)
(string-append "# " all))) (string-append "# " all)))
#t) #t)))))
%standard-phases)))))
(inputs ; TODO: Add optional inputs. (inputs ; TODO: Add optional inputs.
`(("sdl" ,sdl) `(("sdl" ,sdl)
("mesa" ,mesa) ("mesa" ,mesa)