TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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")))) (patches (search-patches "libvirt-add-install-prefix.patch"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags (list
(list "-Ddriver_qemu=enabled" #:configure-flags
"-Dqemu_user=nobody" #~(list "-Ddriver_qemu=enabled"
"-Dqemu_group=kvm" "-Dqemu_user=nobody"
"-Dstorage_disk=enabled" "-Dqemu_group=kvm"
"-Dstorage_dir=enabled" "-Dstorage_disk=enabled"
"-Dpolkit=enabled" "-Dstorage_dir=enabled"
;; XXX The default, but required to make -Dsasl ‘stick’. "-Dpolkit=enabled"
;; See <https://gitlab.com/libvirt/libvirt/-/issues/185> ;; XXX The default, but required to make -Dsasl ‘stick’.
"-Ddriver_remote=enabled" ;; See <https://gitlab.com/libvirt/libvirt/-/issues/185>
"-Dnls=enabled" ;translations "-Ddriver_remote=enabled"
(string-append "-Ddocdir=" (assoc-ref %outputs "out") "/share/doc/" "-Dnls=enabled" ;translations
,name "-" ,version) (string-append "-Ddocdir=" #$output "/share/doc/"
"-Dbash_completion=enabled" #$(package-name this-package) "-"
(string-append "-Dinstall_prefix=" (assoc-ref %outputs "out")) #$(package-version this-package))
"--sysconfdir=/etc" "-Dbash_completion=enabled"
"--localstatedir=/var") (string-append "-Dinstall_prefix=" #$output)
#:phases "--sysconfdir=/etc"
(modify-phases %standard-phases "--localstatedir=/var")
(add-after 'unpack 'skip-directory-confusion #:phases
(lambda _ #~(modify-phases %standard-phases
;; Don't try to install an (unused) /var outside of the store. (add-after 'unpack 'skip-directory-confusion
(substitute* "scripts/meson-install-dirs.py" (lambda _
(("destdir = .*") ;; Don't try to install an (unused) /var outside of the store.
"destdir = '/tmp'")))) (substitute* "scripts/meson-install-dirs.py"
(add-before 'configure 'disable-broken-tests (("destdir = .*")
(lambda _ "destdir = '/tmp'"))))
(let ((tests (list "commandtest" ; hangs idly (add-before 'configure 'disable-broken-tests
"qemuxml2argvtest" ; fails (lambda _
"virnetsockettest"))) ; tries to network (let ((tests (list "commandtest" ; hangs idly
(substitute* "tests/meson.build" "qemuxml2argvtest" ; fails
(((format #f ".*'name': '(~a)'.*" (string-join tests "|"))) "virnetsockettest"))) ; tries to network
"")))))))) (substitute* "tests/meson.build"
(((format #f ".*'name': '(~a)'.*" (string-join tests "|")))
""))))))))
(inputs (inputs
(list acl (list acl
attr attr