From 6bab14437c6d0c4965db053cf17e4232c5322d63 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Feb 2011 13:36:18 +0000
Subject: [PATCH] * libvirt: use /var and set the correct paths to ip/iptables.

svn path=/nixpkgs/trunk/; revision=26091
---
 .../development/libraries/libvirt/default.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 2b107c74bce..d0201771484 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxml2, gnutls, devicemapper, perl, python }:
+{ stdenv, fetchurl, libxml2, gnutls, devicemapper, perl, python, iproute, iptables }:
 
 let version = "0.8.8"; in
 
@@ -10,13 +10,18 @@ stdenv.mkDerivation {
     sha256 = "04z1757qpi3ssnjv5h2qnw1sds2m50yxk67cbdam6w4i50vyl2h3";
   };
 
-  buildInputs = [ libxml2 gnutls devicemapper perl python ];
+  buildInputs = [ libxml2 gnutls devicemapper perl python iproute iptables ];
+
+  configureFlags =
+    ''
+      --localstatedir=/var
+      IP_PATH=${iproute}/sbin/ip
+      IPTABLES_PATH=${iptables}/sbin/iptables
+      IP6TABLES_PATH=${iptables}/sbin/ip6tables
+    '';
+
+  installFlags = "localstatedir=$(TMPDIR)/var";
 
-  # xen currently disabled in nixpkgs
-  configureFlags = ''                                                  
-    --without-xen
-  '';
-  
   meta = {
     homepage = http://libvirt.org/;
     description = "A toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes).";