ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-08 07:56:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libvirt: Use G-expression.

Browse source 
* gnu/packages/virtualization.scm (libvirt)[arguments]: Use gexp.  While at
it, refer to THIS-PACKAGE instead of the NAME and VERSION fields.
This commit is contained in:
Marius Bakke 2022-08-11 18:24:41 +02:00
parent e00b395cb2
commit d7d370e4de
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 35 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
gnu/packages/virtualization.scm
View file

@ -1284,39 +1284,41 @@ (define-public libvirt
(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