diff options
| author | Lars-Dominik Braun <lars@6xq.net> | 2022-08-18 10:11:36 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-08-29 21:15:58 +0200 |
| commit | acbf2f9def5ce181fab09abec0978f1d2c1bcb33 (patch) | |
| tree | d64806423b03e99d7672c04dae63209bfc5e9e8f /gnu | |
| parent | 9529384c92e6427e7d277ffaa391405ef6ab22f3 (diff) | |
| download | guix-acbf2f9def5ce181fab09abec0978f1d2c1bcb33.tar.gz | |
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>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/virtualization.scm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index d451b8529e..005421aaec 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1311,9 +1311,16 @@ pretty simple, REST API.") (substitute* "scripts/meson-install-dirs.py" (("destdir = .*") "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 (lambda _ (let ((tests (list "commandtest" ; hangs idly + "networkxml2conftest" ; fails with absolute dnsmasq "qemuxml2argvtest" ; fails "virnetsockettest"))) ; tries to network (substitute* "tests/meson.build" |