ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: qemu: Add GUI version.

Browse source 
* gnu/packages/qemu.scm (qemu): Rename to...
  (qemu-headless): ... this.
  (qemu/smb-shares): Inherit from it.
  (qemu): New variable.
* gnu/packages/grub.scm (qemu-for-tests): Inherit from QEMU-HEADLESS.
This commit is contained in:
Ludovic Courtès 2013-11-23 18:21:31 +01:00
parent 558a5122fa
commit 4942d42a94
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/grub.scm
View file

@ -38,7 +38,7 @@ (define qemu-for-tests
;; <https://bugs.launchpad.net/bugs/947597> and fixed at ;; <https://bugs.launchpad.net/bugs/947597> and fixed at
;; <http://bzr.savannah.gnu.org/lh/grub/trunk/grub/revision/4828>. ;; <http://bzr.savannah.gnu.org/lh/grub/trunk/grub/revision/4828>.
;; Work around it by using an older QEMU. ;; Work around it by using an older QEMU.
(package (inherit qemu) (package (inherit qemu-headless)
(version "1.3.1") (version "1.3.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)

26
gnu/packages/qemu.scm
View file

@ -36,12 +36,13 @@ (define-module (gnu packages qemu)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages samba) #:use-module (gnu packages samba)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages sdl)
#:use-module (gnu packages perl)) #:use-module (gnu packages perl))
(define-public qemu (define-public qemu-headless
;; Since QEMU 1.3, it incorporates KVM support formerly found in QEMU-KVM. ;; This is QEMU without GUI support.
(package (package
(name "qemu") (name "qemu-headless")
(version "1.5.1") (version "1.5.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -91,8 +92,7 @@ (define-public qemu
%standard-phases)))) %standard-phases))))
(inputs ; TODO: Add optional inputs. (inputs ; TODO: Add optional inputs.
`(;; ("mesa" ,mesa) `(;; ("libaio" ,libaio)
;; ("libaio" ,libaio)
("glib" ,glib) ("glib" ,glib)
("python" ,python-2) ; incompatible with Python 3 according to error message ("python" ,python-2) ; incompatible with Python 3 according to error message
("ncurses" ,ncurses) ("ncurses" ,ncurses)
@ -104,7 +104,6 @@ (define-public qemu
;; ("pciutils" ,pciutils) ;; ("pciutils" ,pciutils)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("alsa-lib" ,alsa-lib) ("alsa-lib" ,alsa-lib)
;; ("SDL" ,SDL)
("zlib" ,zlib) ("zlib" ,zlib)
("attr" ,attr) ("attr" ,attr)
("samba" ,samba))) ; an optional dependency ("samba" ,samba))) ; an optional dependency
@ -112,7 +111,7 @@ (define-public qemu
("perl" ,perl))) ("perl" ,perl)))
(home-page "http://www.qemu-project.org") (home-page "http://www.qemu-project.org")
(synopsis "Machine emulator and virtualizer") (synopsis "Machine emulator and virtualizer (without GUI)")
(description (description
"QEMU is a generic machine emulator and virtualizer. "QEMU is a generic machine emulator and virtualizer.
@ -132,8 +131,17 @@ (define-public qemu
(define-public qemu/smb-shares (define-public qemu/smb-shares
;; A patched QEMU where `-net smb' yields two shares instead of one: one for ;; A patched QEMU where `-net smb' yields two shares instead of one: one for
;; the store, and another one for exchanges with the host. ;; the store, and another one for exchanges with the host.
(package (inherit qemu) (package (inherit qemu-headless)
(name "qemu-with-multiple-smb-shares") (name "qemu-with-multiple-smb-shares")
(source (origin (inherit (package-source qemu)) (source (origin (inherit (package-source qemu-headless))
(patches (patches
(list (search-patch "qemu-multiple-smb-shares.patch"))))))) (list (search-patch "qemu-multiple-smb-shares.patch")))))))
(define-public qemu
;; QEMU with GUI support.
(package (inherit qemu-headless)
(name "qemu")
(synopsis "Machine emulator and virtualizer")
(inputs `(("sdl" ,sdl)
("mesa" ,mesa)
,@(package-inputs qemu-headless)))))