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

Revert "prevent distutils during module install from downloading and load pth files"

Browse Source 
This reverts commit 2a151d9df99f68c555a9f1fd2c80b8889561e9e3.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32659
This commit is contained in:
Florian Friesdorf
2012-02-28 00:07:42 +00:00
parent 9159a78807
commit 43e16d04b9
3 changed files with 2 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
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, site, offlineDistutils }:
{ python, setuptools, wrapPython, lib, site }:
{ name, namePrefix ? "python-"
@@ -69,15 +69,6 @@ python.stdenv.mkDerivation (attrs // {
buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath;
configurePhase = ''
# do not allow distutils to make downloads, whatever install command is used
export PYTHONPATH="${setuptools}/lib/${python.libPrefix}:$PYTHONPATH"
export PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}:$PYTHONPATH"
# enable pth files for dependencies
export PYTHONPATH="${site}/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
'';
# XXX: I think setuptools is not needed here
pythonPath = [ setuptools site ] ++ pythonPath;