~ruther/guix-local: gnu: libvirt: Use absolute dnsmasq.

acbf2f9def5ce181fab09abec0978f1d2c1bcb33 — Lars-Dominik Braun 3 years ago 9529384

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>

patch browse .tar.gz .zip

1 files changed, 7 insertions(+), 0 deletions(-)

M gnu/packages/virtualization.scm

M gnu/packages/virtualization.scm => gnu/packages/virtualization.scm +7 -0

@@ 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"