From cea083bec96ec96710a226abc2e07b1c154aec76 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 10 Sep 2010 10:53:17 +0000 Subject: [PATCH] * 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. svn path=/nixpkgs/trunk/; revision=23710 --- pkgs/applications/virtualization/xen/default.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix index b7c9c1c3d5b..12d16b7f229 100644 --- a/pkgs/applications/virtualization/xen/default.nix +++ b/pkgs/applications/virtualization/xen/default.nix @@ -32,6 +32,14 @@ stdenv.mkDerivation { 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b900b635d3..177e3995fa0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6204,7 +6204,9 @@ let 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;