Author: eelco
Date: Mon Mar 28 18:12:32 2011
New Revision: 26584
URL: https://svn.nixos.org/websvn/nix/?rev=26584&sc=1
Log:
* xen: use wrapPython.
Modified:
nixpkgs/branches/modular-python/pkgs/applications/virtualization/xen/default.nix
nixpkgs/branches/modular-python/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/modular-python/pkgs/applications/virtualization/xen/default.nix
==============================================================================
---
nixpkgs/branches/modular-python/pkgs/applications/virtualization/xen/default.nix
Mon Mar 28 17:19:27 2011 (r26583)
+++
nixpkgs/branches/modular-python/pkgs/applications/virtualization/xen/default.nix
Mon Mar 28 18:12:32 2011 (r26584)
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, which, zlib, pkgconfig, SDL, openssl, python
, libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2, xz
-, lvm2, utillinux, procps, texinfo, perl }:
+, lvm2, utillinux, procps, texinfo, perl, wrapPython, pythonPackages }:
with stdenv.lib;
@@ -51,9 +51,11 @@
buildInputs =
[ which zlib pkgconfig SDL openssl python libuuid gettext ncurses
- dev86 iasl pciutils bzip2 xz texinfo perl
+ dev86 iasl pciutils bzip2 xz texinfo perl wrapPython
];
+ pythonPath = [ pythonPackages.curses ];
+
makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc";
buildFlags = "xen tools stubdom";
@@ -121,19 +123,7 @@
cp -prvd dist/install/boot $out/boot
cp -prvd dist/install/etc $out/etc
cp -dR docs/man1 docs/man5 $out/share/man/
- ''; # */
-
- 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
+ wrapPythonPrograms
''; # */
meta = {
Modified: nixpkgs/branches/modular-python/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/modular-python/pkgs/top-level/all-packages.nix Mon Mar
28 17:19:27 2011 (r26583)
+++ nixpkgs/branches/modular-python/pkgs/top-level/all-packages.nix Mon Mar
28 18:12:32 2011 (r26584)
@@ -6714,9 +6714,7 @@
xdg_utils = callPackage ../tools/X11/xdg-utils { };
- xen = callPackage ../applications/virtualization/xen {
- python = pythonFull;
- };
+ xen = callPackage ../applications/virtualization/xen { };
xfig = callPackage ../applications/graphics/xfig {
stdenv = overrideGCC stdenv gcc34;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
