From e24547ab88075aad3dbbb86631558cdeb5fa69f9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 19 Apr 2012 21:40:07 +0000
Subject: [PATCH] * libvirt updated to 0.9.11.

svn path=/nixpkgs/trunk/; revision=33850
---
 pkgs/development/libraries/libarchive/default.nix | 10 +++++-----
 pkgs/development/libraries/libvirt/default.nix    | 10 ++++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 36e345043e3..fc554dcd875 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -1,5 +1,5 @@
-{fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs
-, sharutils}:
+{ fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs
+, sharutils }:
 
 stdenv.mkDerivation rec {
   name = "libarchive-2.8.3";
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "16095d15334b3c8dbb02db5af3d415f12c1c3bdd4eb43af7bbc36ab7572c0b7a";
   };
 
-  propagatedBuildInputs = [libxml2 zlib bzip2 openssl] ++
-    (if stdenv.isLinux then [e2fsprogs attr acl] else []);
+  propagatedBuildInputs = [ libxml2 zlib bzip2 openssl ] ++
+    stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ];
 
-  buildInputs = [sharutils];
+  buildInputs = [ sharutils ];
 
   meta = {
     description = "A library for reading and writing streaming archives";
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 2e7e4a57e9f..aee034c25da 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python
 , iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext 
-, libtasn1, ebtables, libgcrypt
+, libtasn1, ebtables, libgcrypt, yajl
 }:
 
-let version = "0.9.7"; in
+let version = "0.9.11"; in
 
 stdenv.mkDerivation {
   name = "libvirt-${version}";
 
   src = fetchurl {
     url = "http://libvirt.org/sources/libvirt-${version}.tar.gz";
-    sha256 = "08xg0pfjqfia37xby9187ycsxkrxaz99w9rcq206cz8pwnzhbzr9";
+    sha256 = "0qk0fsc5rxwwjp7801vdanmw61p89xqiy6q279i0kqc3bx1zx66f";
   };
 
   buildInputs =
     [ pkgconfig libxml2 gnutls devicemapper perl python readline lvm2
-      utillinux udev libpciaccess gettext libtasn1 libgcrypt
+      utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl
     ];
 
   preConfigure =
@@ -34,6 +34,8 @@ stdenv.mkDerivation {
         --replace "$out/bin" "${gettext}/bin"
     '';
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = http://libvirt.org/;
     description = "A toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes)";