gnu: qemu: Enable GTK3 frontend.

* gnu/packages/virtualization.scm (qemu)[native-inputs]: Add "gettext" to native-inputs.
[inputs]: Add "gtk+" to inputs.
* gnu/packages/virtualization.scm (qemu-minimal)[native-inputs]: Remove "gettext"
from inherited inputs.
[inputs]: Remove "gtk+" from inherited inputs.
This commit is contained in:
Rutger Helling 2018-04-26 08:17:05 +02:00
parent 27b52c1f6a
commit 90a8ef8c43
No known key found for this signature in database
GPG Key ID: F3A727DB44FCCA36
1 changed files with 7 additions and 2 deletions

View File

@ -39,6 +39,7 @@
#:use-module (gnu packages docbook) #:use-module (gnu packages docbook)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
@ -173,6 +174,7 @@ exec smbd $@")))
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("attr" ,attr) ("attr" ,attr)
("glib" ,glib) ("glib" ,glib)
("gtk+" ,gtk+)
("libaio" ,libaio) ("libaio" ,libaio)
("libattr" ,attr) ("libattr" ,attr)
("libcap" ,libcap) ; virtfs support requires libcap & libattr ("libcap" ,libcap) ; virtfs support requires libcap & libattr
@ -194,7 +196,8 @@ exec smbd $@")))
;; ("vde2" ,vde2) ;; ("vde2" ,vde2)
("virglrenderer" ,virglrenderer) ("virglrenderer" ,virglrenderer)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs `(("glib:bin" ,glib "bin") ; gtester, etc. (native-inputs `(("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin") ; gtester, etc.
("perl" ,perl) ("perl" ,perl)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python-wrapper" ,python-wrapper) ("python-wrapper" ,python-wrapper)
@ -232,8 +235,10 @@ server and embedded PowerPC, and S390 guests.")
''("--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"))))
;; Remove dependencies on optional libraries, notably GUI libraries. ;; Remove dependencies on optional libraries, notably GUI libraries.
(native-inputs (fold alist-delete (package-native-inputs qemu)
'("gettext")))
(inputs (fold alist-delete (package-inputs qemu) (inputs (fold alist-delete (package-inputs qemu)
'("libusb" "mesa" "sdl2" "spice" "virglrenderer" '("libusb" "mesa" "sdl2" "spice" "virglrenderer" "gtk+"
"usbredir" "libdrm" "libepoxy" "pulseaudio"))))) "usbredir" "libdrm" "libepoxy" "pulseaudio")))))
;; The GRUB test suite fails with later versions of Qemu, so we ;; The GRUB test suite fails with later versions of Qemu, so we