Merge pull request #44892 from volth/patch-228
libvirt: jansson required for qemu suppport
This commit is contained in:
commit
5fc5e0642b
1 changed files with 4 additions and 3 deletions
|
@ -4,7 +4,7 @@
|
|||
, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
|
||||
, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
|
||||
, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
|
||||
, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode
|
||||
, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, jansson
|
||||
, enableXen ? false, xen ? null
|
||||
, enableIscsi ? false, openiscsi
|
||||
}:
|
||||
|
@ -35,11 +35,11 @@ in stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ makeWrapper pkgconfig ];
|
||||
buildInputs = [
|
||||
libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
|
||||
libxslt xhtml1 perlPackages.XMLXPath curl libpcap
|
||||
libxslt xhtml1 perlPackages.XMLXPath curl libpcap jansson
|
||||
] ++ optionals (!buildFromTarball) [
|
||||
libtool autoconf automake
|
||||
] ++ optionals stdenv.isLinux [
|
||||
libpciaccess lvm2 lvm2 utillinux systemd libnl numad zfs
|
||||
libpciaccess lvm2 utillinux systemd libnl numad zfs
|
||||
libapparmor libcap_ng numactl attr parted
|
||||
] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [
|
||||
xen
|
||||
|
@ -66,6 +66,7 @@ in stdenv.mkDerivation rec {
|
|||
"--localstatedir=/var"
|
||||
"--sysconfdir=/var/lib"
|
||||
"--with-libpcap"
|
||||
"--with-qemu"
|
||||
"--with-vmware"
|
||||
"--with-vbox"
|
||||
"--with-test"
|
||||
|
|
Loading…
Reference in a new issue