public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* xen: use wrapPython.

Browse Source 
svn path=/nixpkgs/branches/modular-python/; revision=26584
This commit is contained in:
Eelco Dolstra 2011-03-28 18:12:32 +00:00
parent 968496e69b
commit c1b64da1c9
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/virtualization/xen/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, which, zlib, pkgconfig, SDL, openssl, python { 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, texinfo, perl }: , lvm2, utillinux, procps, texinfo, perl, wrapPython, pythonPackages }:
with stdenv.lib; with stdenv.lib;
@ -51,9 +51,11 @@ stdenv.mkDerivation {
buildInputs = buildInputs =
[ which zlib pkgconfig SDL openssl python libuuid gettext ncurses [ 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"; makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc";
buildFlags = "xen tools stubdom"; buildFlags = "xen tools stubdom";
@ -121,19 +123,7 @@ stdenv.mkDerivation {
cp -prvd dist/install/boot $out/boot cp -prvd dist/install/boot $out/boot
cp -prvd dist/install/etc $out/etc cp -prvd dist/install/etc $out/etc
cp -dR docs/man1 docs/man5 $out/share/man/ cp -dR docs/man1 docs/man5 $out/share/man/
''; # */ wrapPythonPrograms
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 = { meta = {

4
pkgs/top-level/all-packages.nix
View File

@ -6714,9 +6714,7 @@ let
xdg_utils = callPackage ../tools/X11/xdg-utils { }; xdg_utils = callPackage ../tools/X11/xdg-utils { };
xen = callPackage ../applications/virtualization/xen { xen = callPackage ../applications/virtualization/xen { };
python = pythonFull;
};
xfig = callPackage ../applications/graphics/xfig { xfig = callPackage ../applications/graphics/xfig {
stdenv = overrideGCC stdenv gcc34; stdenv = overrideGCC stdenv gcc34;