From fd538ef53d5d329031236634b1b77cbe0561b0a8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Sep 2010 15:21:28 +0000
Subject: [PATCH] * Fix some more paths in Xen, and make it use /etc/xen for
 its   configuration files.

svn path=/nixpkgs/trunk/; revision=23821
---
 pkgs/applications/virtualization/xen/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix
index 87ee66ba6e9..0a0bf9d431d 100644
--- a/pkgs/applications/virtualization/xen/default.nix
+++ b/pkgs/applications/virtualization/xen/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
       dev86 iasl pciutils bzip2 xz
     ];
 
-  makeFlags = "PREFIX=$(out)";
+  makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc";
 
   buildFlags = "xen tools";
 
@@ -49,12 +49,19 @@ stdenv.mkDerivation {
       # print the GCC version number properly.
       substituteInPlace xen/Makefile \
         --replace '$(CC) $(CFLAGS) -v' '$(CC) -v'
+
+      substituteInPlace tools/python/xen/xend/server/BlktapController.py \
+        --replace /usr/sbin/tapdisk2 $out/sbin/tapdisk2
+
+      substituteInPlace tools/python/xen/xend/XendQCoWStorageRepo.py \
+        --replace /usr/sbin/qcow-create $out/sbin/qcow-create
     '';
 
   installPhase =
     ''
       cp -prvd dist/install/nix/store/* $out
       cp -prvd dist/install/boot $out/boot
+      cp -prvd dist/install/etc $out/etc
     ''; # */
 
   postFixup =