JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "libvirt: jansson required for qemu suppport"

Browse Source 
This reverts commit df05344d96.

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.
This commit is contained in:
Uli Baum 2018-08-21 22:07:05 +02:00
parent 4ad233e518
commit 528f4a2d1f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/libvirt/default.nix
View File

@ -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"