diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-12-11 23:21:27 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-12-11 23:21:27 +0100 |
commit | 9b601fc2110193435e61955c04499fed019aac62 (patch) | |
tree | 37cca3a505989485fcfb653ebcb0dd8ee55d5308 /gnu/packages/virtualization.scm | |
parent | 939c5b2cb6952cd8549bf17d6fd3bcbfb582f0bd (diff) | |
parent | 27664ea0f08e6c207b7b61c1fd7b8446dce98478 (diff) | |
download | patches-9b601fc2110193435e61955c04499fed019aac62.tar patches-9b601fc2110193435e61955c04499fed019aac62.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/virtualization.scm')
-rw-r--r-- | gnu/packages/virtualization.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index dd0222730f..e83ae43da2 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -220,7 +220,7 @@ exec smbd $@"))) ("spice" ,spice) ("usbredir" ,usbredir) ("util-linux" ,util-linux) - ;; ("vde2" ,vde2) + ("vde2" ,vde2) ("virglrenderer" ,virglrenderer) ("zlib" ,zlib))) (native-inputs `(("gettext" ,gettext-minimal) @@ -268,7 +268,7 @@ server and embedded PowerPC, and S390 guests.") '("gettext"))) (inputs (fold alist-delete (package-inputs qemu) '("libusb" "mesa" "sdl2" "spice" "virglrenderer" "gtk+" - "usbredir" "libdrm" "libepoxy" "pulseaudio"))))) + "usbredir" "libdrm" "libepoxy" "pulseaudio" "vde2"))))) ;; The GRUB test suite fails with later versions of Qemu, so we ;; keep it at 2.10 for now. See |