diff options
author | Rutger Helling <rhelling@mykolab.com> | 2018-04-26 08:17:05 +0200 |
---|---|---|
committer | Rutger Helling <rhelling@mykolab.com> | 2018-04-26 12:45:57 +0200 |
commit | 90a8ef8c4325f97da39d5326b1cd110b3f3984bf (patch) | |
tree | 9e8772d3faa3ac9ed647c859cdac6d88c5297183 | |
parent | 27b52c1f6aa036ec99691a5c76ecf697e09cd62f (diff) | |
download | guix-patches-90a8ef8c4325f97da39d5326b1cd110b3f3984bf.tar guix-patches-90a8ef8c4325f97da39d5326b1cd110b3f3984bf.tar.gz |
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.
-rw-r--r-- | gnu/packages/virtualization.scm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 079b55da57..46f78b8b1e 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -39,6 +39,7 @@ #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages fontutils) + #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -173,6 +174,7 @@ exec smbd $@"))) `(("alsa-lib" ,alsa-lib) ("attr" ,attr) ("glib" ,glib) + ("gtk+" ,gtk+) ("libaio" ,libaio) ("libattr" ,attr) ("libcap" ,libcap) ; virtfs support requires libcap & libattr @@ -194,7 +196,8 @@ exec smbd $@"))) ;; ("vde2" ,vde2) ("virglrenderer" ,virglrenderer) ("zlib" ,zlib))) - (native-inputs `(("glib:bin" ,glib "bin") ; gtester, etc. + (native-inputs `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") ; gtester, etc. ("perl" ,perl) ("pkg-config" ,pkg-config) ("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")))) ;; 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) - '("libusb" "mesa" "sdl2" "spice" "virglrenderer" + '("libusb" "mesa" "sdl2" "spice" "virglrenderer" "gtk+" "usbredir" "libdrm" "libepoxy" "pulseaudio"))))) ;; The GRUB test suite fails with later versions of Qemu, so we |