summary refs log tree commit diff
path: root/pkgs/development/libraries/libvirt
diff options
context:
space:
mode:
authorUli Baum <xeji@cat3.de>2018-08-21 22:07:05 +0200
committerUli Baum <xeji@cat3.de>2018-08-21 22:07:05 +0200
commit528f4a2d1f7e040ff4cb03733a1b604196e61a6c (patch)
treea7fcc693e726649e2377c53d48f6cc9d063905b9 /pkgs/development/libraries/libvirt
parent4ad233e518d25e60d06bb3cb41307f8270f3f18e (diff)
downloadnixlib-528f4a2d1f7e040ff4cb03733a1b604196e61a6c.tar
nixlib-528f4a2d1f7e040ff4cb03733a1b604196e61a6c.tar.gz
nixlib-528f4a2d1f7e040ff4cb03733a1b604196e61a6c.tar.bz2
nixlib-528f4a2d1f7e040ff4cb03733a1b604196e61a6c.tar.lz
nixlib-528f4a2d1f7e040ff4cb03733a1b604196e61a6c.tar.xz
nixlib-528f4a2d1f7e040ff4cb03733a1b604196e61a6c.tar.zst
nixlib-528f4a2d1f7e040ff4cb03733a1b604196e61a6c.zip
Revert "libvirt: jansson required for qemu suppport"
This reverts commit df05344d960895d8b076341ca0d8a0c7333f24b4.

Upstream has reverted their move from yajl to jansson after 4.6.0
because of major issues.
Let's revert to libvirt 4.5.0 and wait for the next upstream release.
Diffstat (limited to 'pkgs/development/libraries/libvirt')
-rw-r--r--pkgs/development/libraries/libvirt/default.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 63f11daad288..e584af775d2b 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, jansson
+, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode
 , 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 jansson
+    libxslt xhtml1 perlPackages.XMLXPath curl libpcap
   ] ++ optionals (!buildFromTarball) [
     libtool autoconf automake
   ] ++ optionals stdenv.isLinux [
-    libpciaccess lvm2 utillinux systemd libnl numad zfs
+    libpciaccess lvm2 lvm2 utillinux systemd libnl numad zfs
     libapparmor libcap_ng numactl attr parted
   ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [
     xen
@@ -66,7 +66,6 @@ in stdenv.mkDerivation rec {
     "--localstatedir=/var"
     "--sysconfdir=/var/lib"
     "--with-libpcap"
-    "--with-qemu"
     "--with-vmware"
     "--with-vbox"
     "--with-test"