@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, fetchgit
2−, pkgconfig, makeWrapper, libtool, autoconf, automake, fetchpatch
2+, pkgconfig, makeWrapper, autoreconfHook, fetchpatch
33, coreutils, libxml2, gnutls, perl, python2, attr, glib, docutils
44, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
55, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
@@ -17,28 +17,26 @@ let
1717 buildFromTarball = stdenv.isDarwin;
1818in stdenv.mkDerivation rec {
1919 pname = "libvirt";
20− version = "6.0.0";
20+ version = "6.1.0";
2121
2222 src =
2323 if buildFromTarball then
2424 fetchurl {
2525 url = "http://libvirt.org/sources/${pname}-${version}.tar.xz";
26− sha256 = "0xkz6n6pyv7k4jj7762v65jdsj8pkcpbnas65hjy7b5vi4in9fz6";
26+ sha256 = "1h7bmd7zgl64mwnxx4ji8l0mqmcbfxsx6kp1scyyfq2mwidihz0n";
2727 }
2828 else
2929 fetchgit {
3030 url = git://libvirt.org/libvirt.git;
3131 rev = "v${version}";
32− sha256 = "0j0rvymxaqavak03w7gblm8ingvbcwczpwfk8s0iqvsgfgk9974p";
32+ sha256 = "18sr3jvpxn45c4vrjzpa4qgnnfxxh95v6l6qk31zka3siv8rrwqx";
3333 fetchSubmodules = true;
3434 };
3535
36− nativeBuildInputs = [ makeWrapper pkgconfig docutils ];
36+ nativeBuildInputs = [ makeWrapper pkgconfig docutils ] ++ optionals (!buildFromTarball) [ autoreconfHook ];
3737 buildInputs = [
3838 libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
3939 libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib
40− ] ++ optionals (!buildFromTarball) [
41− libtool autoconf automake
4240 ] ++ optionals stdenv.isLinux [
4341 libpciaccess lvm2 utillinux systemd libnl numad zfs
4442 libapparmor libcap_ng numactl attr parted
@@ -53,7 +51,6 @@ in stdenv.mkDerivation rec {
5351 ];
5452
5553 preConfigure = ''
56− ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" }
5754 PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH
5855 # the path to qemu-kvm will be stored in VM's .xml and .save files
5956 # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations