diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-08-11 12:56:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-11 12:56:10 +0200 |
| commit | 5fc5e0642ba616f56bbd57da451ceaf5a60f17b5 (patch) | |
| tree | 5dd8c0589915a61c58eabd8b57b8a702e6c315b1 /pkgs | |
| parent | 501607e0ee52f3966dc81d5fa492ce163c2abcfd (diff) | |
| parent | df05344d960895d8b076341ca0d8a0c7333f24b4 (diff) | |
| download | nixlib-5fc5e0642ba616f56bbd57da451ceaf5a60f17b5.tar nixlib-5fc5e0642ba616f56bbd57da451ceaf5a60f17b5.tar.gz nixlib-5fc5e0642ba616f56bbd57da451ceaf5a60f17b5.tar.bz2 nixlib-5fc5e0642ba616f56bbd57da451ceaf5a60f17b5.tar.lz nixlib-5fc5e0642ba616f56bbd57da451ceaf5a60f17b5.tar.xz nixlib-5fc5e0642ba616f56bbd57da451ceaf5a60f17b5.tar.zst nixlib-5fc5e0642ba616f56bbd57da451ceaf5a60f17b5.zip | |
Merge pull request #44892 from volth/patch-228
libvirt: jansson required for qemu suppport
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libvirt/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index e584af775d2b..63f11daad288 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -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" |