diff options
| author | Marius Bakke <marius@gnu.org> | 2022-08-11 18:24:41 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-08-11 21:58:01 +0200 |
| commit | d7d370e4de878bceefbb11354b9e137a5f03838e (patch) | |
| tree | 0ca9e383eb634c9db495eee58680ec2e71dc74b3 | |
| parent | e00b395cb2fd885a7b9af20d2ba8303b736e7c0f (diff) | |
| download | guix-d7d370e4de878bceefbb11354b9e137a5f03838e.tar.gz | |
gnu: libvirt: Use G-expression.
* gnu/packages/virtualization.scm (libvirt)[arguments]: Use gexp. While at it, refer to THIS-PACKAGE instead of the NAME and VERSION fields.
| -rw-r--r-- | gnu/packages/virtualization.scm | 68 |
1 files changed, 35 insertions, 33 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 7cced7ef34..7d13c659eb 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1284,39 +1284,41 @@ pretty simple, REST API.") (patches (search-patches "libvirt-add-install-prefix.patch")))) (build-system meson-build-system) (arguments - `(#:configure-flags - (list "-Ddriver_qemu=enabled" - "-Dqemu_user=nobody" - "-Dqemu_group=kvm" - "-Dstorage_disk=enabled" - "-Dstorage_dir=enabled" - "-Dpolkit=enabled" - ;; XXX The default, but required to make -Dsasl ‘stick’. - ;; See <https://gitlab.com/libvirt/libvirt/-/issues/185> - "-Ddriver_remote=enabled" - "-Dnls=enabled" ;translations - (string-append "-Ddocdir=" (assoc-ref %outputs "out") "/share/doc/" - ,name "-" ,version) - "-Dbash_completion=enabled" - (string-append "-Dinstall_prefix=" (assoc-ref %outputs "out")) - "--sysconfdir=/etc" - "--localstatedir=/var") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'skip-directory-confusion - (lambda _ - ;; Don't try to install an (unused) /var outside of the store. - (substitute* "scripts/meson-install-dirs.py" - (("destdir = .*") - "destdir = '/tmp'")))) - (add-before 'configure 'disable-broken-tests - (lambda _ - (let ((tests (list "commandtest" ; hangs idly - "qemuxml2argvtest" ; fails - "virnetsockettest"))) ; tries to network - (substitute* "tests/meson.build" - (((format #f ".*'name': '(~a)'.*" (string-join tests "|"))) - "")))))))) + (list + #:configure-flags + #~(list "-Ddriver_qemu=enabled" + "-Dqemu_user=nobody" + "-Dqemu_group=kvm" + "-Dstorage_disk=enabled" + "-Dstorage_dir=enabled" + "-Dpolkit=enabled" + ;; XXX The default, but required to make -Dsasl ‘stick’. + ;; See <https://gitlab.com/libvirt/libvirt/-/issues/185> + "-Ddriver_remote=enabled" + "-Dnls=enabled" ;translations + (string-append "-Ddocdir=" #$output "/share/doc/" + #$(package-name this-package) "-" + #$(package-version this-package)) + "-Dbash_completion=enabled" + (string-append "-Dinstall_prefix=" #$output) + "--sysconfdir=/etc" + "--localstatedir=/var") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'skip-directory-confusion + (lambda _ + ;; Don't try to install an (unused) /var outside of the store. + (substitute* "scripts/meson-install-dirs.py" + (("destdir = .*") + "destdir = '/tmp'")))) + (add-before 'configure 'disable-broken-tests + (lambda _ + (let ((tests (list "commandtest" ; hangs idly + "qemuxml2argvtest" ; fails + "virnetsockettest"))) ; tries to network + (substitute* "tests/meson.build" + (((format #f ".*'name': '(~a)'.*" (string-join tests "|"))) + "")))))))) (inputs (list acl attr |