1 files changed, 45 insertions, 34 deletions
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index ce81c1b2e8c..4027bd8a84e 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,52 +1,63 @@
 { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python
 , iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext
 , libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng
+, dnsmasq, libnl
 }:
 
-let version = "1.1.2"; in
+let version = "1.2.5"; in
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "libvirt-${version}";
 
   src = fetchurl {
-    url = "http://libvirt.org/sources/libvirt-${version}.tar.gz";
-    md5 = "1835bbfa492099bce12e2934870e5611";
+    url = "http://libvirt.org/sources/${name}.tar.gz";
+    sha256 = "0igd74wkksgv24i2xaa8wx51iqpgjp1v7820pk93m0jv8gipvscf";
   };
 
-  buildInputs =
-    [ pkgconfig libxml2 gnutls devicemapper perl python readline lvm2
-      utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl makeWrapper
-      libcap_ng
-    ];
-
-  # see http://www.mail-archive.com/libvir-list@redhat.com/msg83693.html
-  patches = [ ./securtyfs_userns.patch ];
-
-  preConfigure =
-    ''
-      PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev}/sbin:$PATH
-      patchShebangs . # fixes /usr/bin/python references
-    '';
-
-  configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-init-script=redhat --without-macvtap";
-
-  installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc";
-
-  postInstall =
-    ''
-      substituteInPlace $out/libexec/libvirt-guests.sh \
-        --replace "$out/bin" "${gettext}/bin"
-      wrapProgram $out/sbin/libvirtd \
-        --prefix PATH : ${iptables}/sbin:${iproute}/sbin:${pmutils}/bin
-    '';
+  buildInputs = [
+    pkgconfig libxml2 gnutls devicemapper perl python readline lvm2
+    utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl makeWrapper
+    libcap_ng libnl
+  ];
+
+  preConfigure = ''
+    PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev}/sbin:${dnsmasq}/bin:$PATH
+    patchShebangs . # fixes /usr/bin/python references
+  '';
+
+  configureFlags = [
+    "--localstatedir=/var"
+    "--sysconfdir=/etc"
+    "--with-init-script=redhat"
+    "--with-macvtap"
+    "--with-virtualport"
+  ];
+
+  installFlags = [
+    "localstatedir=$(TMPDIR)/var"
+    "sysconfdir=$(out)/etc"
+  ];
+
+  postInstall = ''
+    substituteInPlace $out/libexec/libvirt-guests.sh \
+      --replace "$out/bin" "${gettext}/bin"
+    wrapProgram $out/sbin/libvirtd \
+      --prefix PATH : ${iptables}/sbin:${iproute}/sbin:${pmutils}/bin
+  '';
 
   enableParallelBuilding = true;
+
   NIX_CFLAGS_COMPILE = "-fno-stack-protector";
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://libvirt.org/;
-    description = "A toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes)";
-    license = "LGPLv2+";
-    platforms = stdenv.lib.platforms.linux;
+    repositories.git = git://libvirt.org/libvirt.git;
+    description = ''
+      A toolkit to interact with the virtualization capabilities of recent
+      versions of Linux (and other OSes)
+    '';
+    license = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ wizeman ];
+    platforms = platforms.linux;
   };
 }