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

offlineDistutils in PYTHONPATH in configurePhase instead of builder.sh

Browse Source 
Conflicts:
	pkgs/development/python-modules/generic/default.nix
This commit is contained in:
Florian Friesdorf 2012-11-24 22:32:47 +01:00
parent ccb5d0fc19
commit 74d963c69a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/python-modules/generic/builder.sh
View File

@ -1,6 +0,0 @@
source $stdenv/setup
# do not allow distutils to make downloads, whatever install command is used
export PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}:$PYTHONPATH"
genericBuild

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

@ -32,6 +32,7 @@
python setup.py test python setup.py test
runHook postCheck runHook postCheck
'' ''
, configurePhase ? "true"
, postInstall ? "" , postInstall ? ""
@ -45,7 +46,12 @@ python.stdenv.mkDerivation (attrs // {
buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath;
builder = ./builder.sh; buildInputStrings = map toString buildInputs;
configurePhase = ''
export PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}:$PYTHONPATH"
${configurePhase}
'';
pythonPath = [ setuptools] ++ pythonPath; pythonPath = [ setuptools] ++ pythonPath;