me/guix
Archived
1
0
Fork 0
Code Activity

gnu: QEMU: Unbundle dtc and slirp.

Browse source 
* 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
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/virtualization.scm
View file

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