[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/15: gnu: libvirt: Use G-expression.
From: |
guix-commits |
Subject: |
06/15: gnu: libvirt: Use G-expression. |
Date: |
Thu, 11 Aug 2022 16:00:44 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit d7d370e4de878bceefbb11354b9e137a5f03838e
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Thu Aug 11 18:24:41 2022 +0200
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.
---
gnu/packages/virtualization.scm | 68 +++++++++++++++++++++--------------------
1 file 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
- branch master updated (dd7a29faf3 -> 99b73f6041), guix-commits, 2022/08/11
- 01/15: gnu: python-pyicu: Update home page., guix-commits, 2022/08/11
- 05/15: gnu: libvirt: Remove input labels., guix-commits, 2022/08/11
- 04/15: gnu: libvirt, python-libvirt: Update to 8.6.0., guix-commits, 2022/08/11
- 07/15: gnu: python-libvirt: Add 'upstream-name' property., guix-commits, 2022/08/11
- 10/15: gnu: mediasdk: Build reproducibly., guix-commits, 2022/08/11
- 09/15: gnu: mediasdk: Remove input labels., guix-commits, 2022/08/11
- 06/15: gnu: libvirt: Use G-expression.,
guix-commits <=
- 02/15: gnu: python-pyicu: Update to 2.9., guix-commits, 2022/08/11
- 03/15: gnu: catch2@1: Adjust for glibc 2.34 and later., guix-commits, 2022/08/11
- 14/15: gnu: ntfs-3g: Add release-monitoring-url and upstream-name., guix-commits, 2022/08/11
- 13/15: gnu: openconnect-sso: Remove input labels., guix-commits, 2022/08/11
- 15/15: gnu: ntfs-3g: Update to 2022.5.17., guix-commits, 2022/08/11
- 11/15: gnu: folks: Update to 0.15.5., guix-commits, 2022/08/11
- 08/15: gnu: mediasdk: Update to 22.4.4., guix-commits, 2022/08/11
- 12/15: gnu: tracker: Update to 3.3.3., guix-commits, 2022/08/11