nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: libvirt: Provide '<rpc/rpc.h>'. 

* gnu/packages/virtualization.scm (libvirt)[inputs]: Add LIBTIRPC.
[arguments]: Add phase 'patch-libtirpc-file-names'.
This commit is contained in:
Marius Bakke 2019-07-18 18:28:19 +02:00
parent 4788c1ae17
commit 308af63460
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/packages/virtualization.scm
View File

@ -62,6 +62,7 @@
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages nettle) #:use-module (gnu packages nettle)
#:use-module (gnu packages networking) #:use-module (gnu packages networking)
#:use-module (gnu packages onc-rpc)
#:use-module (gnu packages package-management) #:use-module (gnu packages package-management)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
@ -423,6 +424,15 @@ manage system or application containers.")
(substitute* "config.h.in" (substitute* "config.h.in"
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))
#t)) #t))
(add-before 'configure 'patch-libtirpc-file-names
(lambda* (#:key inputs #:allow-other-keys)
;; libvirt uses an m4 macro instead of pkg-config to determine where
;; the RPC headers are located. Tell it to look in the right place.
(substitute* "configure"
(("/usr/include/tirpc") ;defined in m4/virt-xdr.m4
(string-append (assoc-ref inputs "libtirpc")
"/include/tirpc")))
#t))
(add-before 'configure 'disable-broken-tests (add-before 'configure 'disable-broken-tests
(lambda _ (lambda _
(let ((tests (list "commandtest" ; hangs idly (let ((tests (list "commandtest" ; hangs idly
@ -459,8 +469,9 @@ manage system or application containers.")
("qemu" ,qemu) ("qemu" ,qemu)
("libpcap" ,libpcap) ("libpcap" ,libpcap)
("libnl" ,libnl) ("libnl" ,libnl)
("libtirpc" ,libtirpc) ;for <rpc/rpc.h>
("libuuid" ,util-linux) ("libuuid" ,util-linux)
("lvm2" ,lvm2) ; for libdevmapper ("lvm2" ,lvm2) ;for libdevmapper
("curl" ,curl) ("curl" ,curl)
("openssl" ,openssl) ("openssl" ,openssl)
("cyrus-sasl" ,cyrus-sasl) ("cyrus-sasl" ,cyrus-sasl)