diff options
| author | Marius Bakke <marius@gnu.org> | 2022-09-11 13:32:24 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-09-11 19:43:15 +0200 |
| commit | 6ef782ee22bfc6ef3c60f2a4d2bb99ca0bdca2f5 (patch) | |
| tree | 43a47f8158912d9b722ebc935bd71e393588a15d /gnu/packages/virtualization.scm | |
| parent | 2487a75d77224ed8db8d048ae16d60a37da5f53e (diff) | |
| download | guix-6ef782ee22bfc6ef3c60f2a4d2bb99ca0bdca2f5.tar.gz | |
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.
Diffstat (limited to 'gnu/packages/virtualization.scm')
| -rw-r--r-- | gnu/packages/virtualization.scm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 2860894bbd..cebcc9742d 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -61,6 +61,7 @@ #: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 @@ (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 @@ (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 @@ exec smbd $@"))) (inputs (list alsa-lib bash-minimal + dtc glib gtk+ libaio @@ -339,6 +345,7 @@ exec smbd $@"))) libjpeg-turbo libpng libseccomp + libslirp liburing libusb ;USB pass-through support mesa |