diff options
| author | Florian Friesdorf <flo@chaoflow.net> | 2012-02-28 00:07:42 +0000 |
|---|---|---|
| committer | Florian Friesdorf <flo@chaoflow.net> | 2012-02-28 00:07:42 +0000 |
| commit | 43e16d04b9194539b7fa996518194236b2f316b1 (patch) | |
| tree | 620be1776c5d186983c0902d4deb664b5d79bd91 /pkgs/development/python-modules/generic | |
| parent | 9159a788076d88cdb0c3a2e18522ce60c77e527f (diff) | |
| download | nixpkgs-43e16d04b9194539b7fa996518194236b2f316b1.tar nixpkgs-43e16d04b9194539b7fa996518194236b2f316b1.tar.gz nixpkgs-43e16d04b9194539b7fa996518194236b2f316b1.tar.bz2 nixpkgs-43e16d04b9194539b7fa996518194236b2f316b1.tar.lz nixpkgs-43e16d04b9194539b7fa996518194236b2f316b1.tar.xz nixpkgs-43e16d04b9194539b7fa996518194236b2f316b1.tar.zst nixpkgs-43e16d04b9194539b7fa996518194236b2f316b1.zip | |
Revert "prevent distutils during module install from downloading and load pth files"
This reverts commit 2a151d9df99f68c555a9f1fd2c80b8889561e9e3. svn path=/nixpkgs/branches/stdenv-updates/; revision=32659
Diffstat (limited to 'pkgs/development/python-modules/generic')
| -rw-r--r-- | pkgs/development/python-modules/generic/default.nix | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 50653d1abc4..781fc273de4 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -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; |