* Fix various references to /usr.

svn path=/nixpkgs/trunk/; revision=23788

1 files changed, 32 insertions, 2 deletions

diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix
index 12d16b7f229..87ee66ba6e9 100644
--- a/pkgs/applications/virtualization/xen/default.nix
+++ b/pkgs/applications/virtualization/xen/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, which, zlib, pkgconfig, SDL, openssl, python
-, libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2, xz }:
+, libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2, xz
+, lvm2, utillinux, procps }:
 
 let version = "4.0.1"; in 
 
@@ -26,18 +27,47 @@ stdenv.mkDerivation {
 
   buildFlags = "xen tools";
 
+  preBuild =
+    ''
+      substituteInPlace tools/libfsimage/common/fsimage_plugin.c \
+        --replace /usr $out
+
+      substituteInPlace tools/blktap2/lvm/lvm-util.c \
+        --replace /usr/sbin/vgs ${lvm2}/sbin/vgs \
+        --replace /usr/sbin/lvs ${lvm2}/sbin/lvs
+
+      substituteInPlace tools/hotplug/Linux/network-bridge \
+        --replace /usr/bin/logger ${utillinux}/bin/logger
+
+      substituteInPlace tools/xenmon/xenmon.py \
+        --replace /usr/bin/pkill ${procps}/bin/pkill
+
+      substituteInPlace tools/xenstat/Makefile \
+        --replace /usr/include/curses.h ${ncurses}/include/curses.h
+
+      # Work around a bug in our GCC wrapper: `gcc -MF foo -v' doesn't
+      # print the GCC version number properly.
+      substituteInPlace xen/Makefile \
+        --replace '$(CC) $(CFLAGS) -v' '$(CC) -v'
+    '';
+
   installPhase =
     ''
       cp -prvd dist/install/nix/store/* $out
       cp -prvd dist/install/boot $out/boot
     ''; # */
 
-  # Set the Python search path in all Python scripts.
   postFixup =
     ''
+      # Set the Python search path in all Python scripts.
       for fn in $(grep -l '#!.*python' $out/bin/* $out/sbin/*); do
           sed -i "$fn" -e "1 a import sys\nsys.path = ['$out/lib/python2.6/site-packages'] + sys.path"
       done
+
+      # Remove calls to `env'.
+      for fn in $(grep -l '#!.*/env.*python' $out/bin/* $out/sbin/*); do
+          sed -i "$fn" -e "1 s^/nix/store/.*/env.*python^${python}/bin/python^"
+      done
     ''; # */
 
   meta = {