diff options
author | Ludovic Courtès <ludo@gnu.org> | 2016-05-26 23:39:46 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2016-05-26 23:58:23 +0200 |
commit | 05051e8bb1ced2b34b7c7813cad70794c9792297 (patch) | |
tree | d450b47d235a664d90274f0e732b08a541040a2e /gnu/packages | |
parent | 219b45567a06c8b553459821ef64ff35eba2169d (diff) | |
download | guix-05051e8bb1ced2b34b7c7813cad70794c9792297.tar.gz |
gnu: qemu: Use 'modify-phases'.
* gnu/packages/qemu.scm (qemu)[arguments]: Use 'modify-phases'.
Diffstat (limited to 'gnu/packages')
-rw-r--r-- | gnu/packages/qemu.scm | 89 |
1 files changed, 43 insertions, 46 deletions
diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm index 89741eeb6d..dcba27936a 100644 --- a/gnu/packages/qemu.scm +++ b/gnu/packages/qemu.scm @@ -69,55 +69,52 @@ ;; boot_sector_test: assertion failed (signature == SIGNATURE): (0x00000000 == 0x0000dead) #:parallel-tests? #f - #:phases (alist-replace - 'configure - (lambda* (#:key inputs outputs (configure-flags '()) + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs (configure-flags '()) #:allow-other-keys) - ;; The `configure' script doesn't understand some of the - ;; GNU options. Thus, add a new phase that's compatible. - (let ((out (assoc-ref outputs "out"))) - (setenv "SHELL" (which "bash")) + ;; The `configure' script doesn't understand some of the + ;; GNU options. Thus, add a new phase that's compatible. + (let ((out (assoc-ref outputs "out"))) + (setenv "SHELL" (which "bash")) - ;; While we're at it, patch for tests. - (substitute* "tests/libqtest.c" - (("/bin/sh") (which "sh"))) - - ;; The binaries need to be linked against -lrt. - (setenv "LDFLAGS" "-lrt") - (zero? - (apply system* - `("./configure" - ,(string-append "--cc=" (which "gcc")) - "--disable-debug-info" ; save build space - "--enable-virtfs" ; just to be sure - ,(string-append "--prefix=" out) - ,@configure-flags))))) - (alist-cons-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"))) - (mkdir-p infodir) - (for-each (lambda (info) - (copy-file - info - (string-append infodir "/" info))) - (find-files "." "\\.info$")) - #t))))) - (alist-cons-before - 'check 'disable-test-qga - (lambda _ - (substitute* "tests/Makefile" - ;; Comment out the test-qga test, which needs /sys and - ;; fails within the build environment. - (("check-unit-.* tests/test-qga" all) - (string-append "# " all))) - #t) - %standard-phases))))) + ;; While we're at it, patch for tests. + (substitute* "tests/libqtest.c" + (("/bin/sh") (which "sh"))) + ;; The binaries need to be linked against -lrt. + (setenv "LDFLAGS" "-lrt") + (zero? + (apply system* + `("./configure" + ,(string-append "--cc=" (which "gcc")) + "--disable-debug-info" ; save build space + "--enable-virtfs" ; just to be sure + ,(string-append "--prefix=" out) + ,@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"))) + (mkdir-p infodir) + (for-each (lambda (info) + (copy-file + info + (string-append infodir "/" info))) + (find-files "." "\\.info$")) + #t)))))) + (add-before 'check 'disable-test-qga + (lambda _ + (substitute* "tests/Makefile" + ;; Comment out the test-qga test, which needs /sys and + ;; fails within the build environment. + (("check-unit-.* tests/test-qga" all) + (string-append "# " all))) + #t))))) (inputs ; TODO: Add optional inputs. `(("sdl" ,sdl) ("mesa" ,mesa) |