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

gnu: qemu: Enable spice usb redirection support. 

* gnu/packages/virtualization.scm (qemu)[arguments]<#:configure-flags>: New
argument.
[inputs]: Add usbredir.
(qemu-minimal)[arguments]<#:configure-flags>: Restrict them even when they are
set by qemu.
[inputs]: Remove usbredir.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Andy Patterson 2017-10-15 16:03:22 -04:00 committed by Ludovic Courtès
parent ad3c61fcd3
commit b376ec57f9
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/packages/virtualization.scm
View File

@ -4,6 +4,7 @@
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017 Andy Patterson <ajpatter@uwaterloo.ca>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -85,7 +86,7 @@
'(;; Running tests in parallel can occasionally lead to failures, like: '(;; Running tests in parallel can occasionally lead to failures, like:
;; boot_sector_test: assertion failed (signature == SIGNATURE): (0x00000000 == 0x0000dead) ;; boot_sector_test: assertion failed (signature == SIGNATURE): (0x00000000 == 0x0000dead)
#:parallel-tests? #f #:parallel-tests? #f
#:configure-flags '("--enable-usb-redir")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
@ -152,6 +153,7 @@
("pixman" ,pixman) ("pixman" ,pixman)
("sdl" ,sdl) ("sdl" ,sdl)
("spice" ,spice) ("spice" ,spice)
("usbredir" ,usbredir)
("util-linux" ,util-linux) ("util-linux" ,util-linux)
;; ("vde2" ,vde2) ;; ("vde2" ,vde2)
("virglrenderer" ,virglrenderer) ("virglrenderer" ,virglrenderer)
@ -188,14 +190,15 @@ server and embedded PowerPC, and S390 guests.")
(name "qemu-minimal") (name "qemu-minimal")
(synopsis "Machine emulator and virtualizer (without GUI)") (synopsis "Machine emulator and virtualizer (without GUI)")
(arguments (arguments
`(#:configure-flags (substitute-keyword-arguments (package-arguments qemu)
((#:configure-flags _ '(list))
;; Restrict to the targets supported by Guix. ;; Restrict to the targets supported by Guix.
'("--target-list=i386-softmmu,x86_64-softmmu,mips64el-softmmu,arm-softmmu,aarch64-softmmu") ''("--target-list=i386-softmmu,x86_64-softmmu,mips64el-softmmu,arm-softmmu,aarch64-softmmu"))))
,@(package-arguments qemu)))
;; Remove dependencies on optional libraries, notably GUI libraries. ;; Remove dependencies on optional libraries, notably GUI libraries.
(inputs (fold alist-delete (package-inputs qemu) (inputs (fold alist-delete (package-inputs qemu)
'("libusb" "mesa" "sdl" "spice" "virglrenderer"))))) '("libusb" "mesa" "sdl" "spice" "virglrenderer"
"usbredir")))))
(define-public libosinfo (define-public libosinfo
(package (package