me
/
guix
Archived
1
0
Fork 0
Code

gnu: libvirt: Use absolute dnsmasq. 

Fixes <https://bugs.gnu.org/57272>.
Reported by Lars-Dominik Braun <lars@6xq.net>.

* gnu/packages/virtualization.scm (libvirt)[arguments]: Substitute the
absolute dnsmasq file name.  Disable one test.

Co-authored-by: Marius Bakke <marius@gnu.org>
master
Lars-Dominik Braun 2022-08-18 10:11:36 +02:00 committed by Marius Bakke
parent 9529384c92
commit acbf2f9def
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/packages/virtualization.scm
View File

@ -1311,9 +1311,16 @@ pretty simple, REST API.")
(substitute* "scripts/meson-install-dirs.py" (substitute* "scripts/meson-install-dirs.py"
(("destdir = .*") (("destdir = .*")
"destdir = '/tmp'")))) "destdir = '/tmp'"))))
(add-after 'unpack 'use-absolute-dnsmasq
(lambda* (#:key inputs #:allow-other-keys)
(let ((dnsmasq (search-input-file inputs "sbin/dnsmasq")))
(substitute* "src/util/virdnsmasq.c"
(("#define DNSMASQ \"dnsmasq\"")
(string-append "#define DNSMASQ \"" dnsmasq "\""))))))
(add-before 'configure 'disable-broken-tests (add-before 'configure 'disable-broken-tests
(lambda _ (lambda _
(let ((tests (list "commandtest" ; hangs idly (let ((tests (list "commandtest" ; hangs idly
"networkxml2conftest" ; fails with absolute dnsmasq
"qemuxml2argvtest" ; fails "qemuxml2argvtest" ; fails
"virnetsockettest"))) ; tries to network "virnetsockettest"))) ; tries to network
(substitute* "tests/meson.build" (substitute* "tests/meson.build"