Author: eelco
Date: Fri Sep 10 10:53:17 2010
New Revision: 23710
URL: https://svn.nixos.org/websvn/nix/?rev=23710&sc=1
Log:
* Set the Python search path for Xen's Python scripts. As an
experiment, do this by patching a line setting sys.path into the
script, rather than using makeWrapper.
* Xen requires pythonFull because it needs https/ssl support.
Modified:
nixpkgs/trunk/pkgs/applications/virtualization/xen/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/virtualization/xen/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/virtualization/xen/default.nix Fri Sep
10 09:31:31 2010 (r23709)
+++ nixpkgs/trunk/pkgs/applications/virtualization/xen/default.nix Fri Sep
10 10:53:17 2010 (r23710)
@@ -32,6 +32,14 @@
cp -prvd dist/install/boot $out/boot
''; # */
+ # Set the Python search path in all Python scripts.
+ postFixup =
+ ''
+ 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
+ ''; # */
+
meta = {
homepage = http://www.xen.org/;
description = "Xen hypervisor and management tools for Dom0";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Sep 10 09:31:31
2010 (r23709)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Sep 10 10:53:17
2010 (r23710)
@@ -6204,7 +6204,9 @@
xdg_utils = callPackage ../tools/X11/xdg-utils { };
- xen = callPackage ../applications/virtualization/xen { };
+ xen = callPackage ../applications/virtualization/xen {
+ python = pythonFull;
+ };
xfig = callPackage ../applications/graphics/xfig {
stdenv = overrideGCC stdenv gcc34;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
