Author: eelco
Date: Thu Sep 16 15:21:28 2010
New Revision: 23821
URL: https://svn.nixos.org/websvn/nix/?rev=23821&sc=1
Log:
* Fix some more paths in Xen, and make it use /etc/xen for its
configuration files.
Modified:
nixpkgs/trunk/pkgs/applications/virtualization/xen/default.nix
Modified: nixpkgs/trunk/pkgs/applications/virtualization/xen/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/virtualization/xen/default.nix Thu Sep
16 11:44:48 2010 (r23820)
+++ nixpkgs/trunk/pkgs/applications/virtualization/xen/default.nix Thu Sep
16 15:21:28 2010 (r23821)
@@ -23,7 +23,7 @@
dev86 iasl pciutils bzip2 xz
];
- makeFlags = "PREFIX=$(out)";
+ makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc";
buildFlags = "xen tools";
@@ -49,12 +49,19 @@
# 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 =
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
