gnu: QEMU: Unbundle dtc and slirp.

* gnu/packages/virtualization.scm (qemu)[source](snippet): Delete two more
directories.
[arguments]: Add "--enable-slirp" and "--enable-fdt" in #:configure-flags.
[inputs]: Add DTC and LIBSLIRP.
This commit is contained in:
Marius Bakke 2022-09-11 13:32:24 +02:00
parent 2487a75d77
commit 6ef782ee22
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA

View file

@ -61,6 +61,7 @@ (define-module (gnu packages virtualization)
#:use-module (gnu packages cluster)
#:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
#:use-module (gnu packages containers)
#:use-module (gnu packages cross-base)
#:use-module (gnu packages curl)
#:use-module (gnu packages cyrus-sasl)
@ -172,8 +173,10 @@ (define-public qemu
(modules '((guix build utils)))
(snippet
'(begin
;; Delete the bundled meson copy.
(delete-file-recursively "meson")))))
;; Delete bundled code that we provide externally.
;; TODO: Unbundle SeaBIOS!
(for-each delete-file-recursively
'("dtc" "meson" "slirp"))))))
(outputs '("out" "static" "doc")) ;5.3 MiB of HTML docs
(build-system gnu-build-system)
(arguments
@ -190,6 +193,8 @@ (define-public qemu
(string-append "--host-cc=" gcc)
(string-append "--prefix=" out)
"--sysconfdir=/etc"
"--enable-slirp=system"
"--enable-fdt=system"
(string-append "--smbd=" out "/libexec/samba-wrapper")
"--disable-debug-info" ;for space considerations
;; The binaries need to be linked against -lrt.
@ -329,6 +334,7 @@ (define-public qemu
(inputs
(list alsa-lib
bash-minimal
dtc
glib
gtk+
libaio
@ -339,6 +345,7 @@ (define-public qemu
libjpeg-turbo
libpng
libseccomp
libslirp
liburing
libusb ;USB pass-through support
mesa