Author: eelco
Date: Thu Feb 24 13:36:18 2011
New Revision: 26091
URL: https://svn.nixos.org/websvn/nix/?rev=26091&sc=1
Log:
* libvirt: use /var and set the correct paths to ip/iptables.
Modified:
nixpkgs/trunk/pkgs/development/libraries/libvirt/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/libvirt/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/libvirt/default.nix Thu Feb
24 13:11:51 2011 (r26090)
+++ nixpkgs/trunk/pkgs/development/libraries/libvirt/default.nix Thu Feb
24 13:36:18 2011 (r26091)
@@ -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 @@
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).";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
