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

include site for python wrappers to enable deps via pth files

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32582
This commit is contained in:
Florian Friesdorf 2012-02-26 17:23:05 +00:00
parent 8adcbec448
commit ccb34b093f
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/python-modules/generic/default.nix
View File

@ -3,7 +3,7 @@
(http://pypi.python.org/pypi/setuptools/), which represents a large
number of Python packages nowadays. */
{ python, setuptools, wrapPython, lib }:
{ python, setuptools, wrapPython, lib, site }:
{ name, namePrefix ? "python-"
@ -69,7 +69,8 @@ python.stdenv.mkDerivation (attrs // {
buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath;
pythonPath = [ setuptools] ++ pythonPath;
# XXX: I think setuptools is not needed here
pythonPath = [ setuptools site ] ++ pythonPath;
# XXX: Should we run `easy_install --always-unzip'? It doesn't seem
# to have a noticeable impact on small scripts.

6
pkgs/development/python-modules/setuptools/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python, wrapPython }:
{ stdenv, fetchurl, python, wrapPython, site }:
stdenv.mkDerivation rec {
name = "setuptools-0.6c11";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1lx1hwxkhipyh206bgl90ddnfcnb68bzcvyawczbf833fadyl3v3";
};
buildInputs = [ python wrapPython ];
buildInputs = [ python wrapPython site ];
buildPhase = "python setup.py build --build-base $out";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
# remove generic files, leave setuptools.pth
rm $dst/site.py*
rm $dst/easy-install.pth
wrapPythonPrograms
pythonPath=${site} wrapPythonPrograms
'';
doCheck = false; # doesn't work with Python 2.7

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

@ -9,13 +9,13 @@ let pythonPackages = python.modules // rec {
buildPythonPackage = import ../development/python-modules/generic {
inherit (pkgs) lib;
inherit python wrapPython setuptools;
inherit python wrapPython setuptools site;
};
setuptools = import ../development/python-modules/setuptools {
inherit (pkgs) stdenv fetchurl;
inherit python wrapPython;
inherit python wrapPython site;
};