diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-15 11:29:02 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-15 11:43:21 -0400 |
| commit | 4920f6e634eeecb37b501bdc024dfe0aab849ed0 (patch) | |
| tree | c7dd5859715071cb602133b67449a29488027f70 /gnu/packages/virtualization.scm | |
| parent | 513091dbd2eeba138b558f5f9bb1ee6e68eee01d (diff) | |
| parent | 3d297a0017210f1dd135592efb10846840a8af88 (diff) | |
Merge branch 'staging' into core-updates
Conflicts resolved in:
gnu/local.mk
gnu/packages/cmake.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/sdl.scm
pango-next, vala-next and librsvg-bootstrap were removed in the process.
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 |