nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 02:13:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'py/offline-distutils' into python-merge

Browse Source 
Conflicts:
	pkgs/development/python-modules/generic/builder.sh
	pkgs/development/python-modules/generic/default.nix
This commit is contained in:
Florian Friesdorf 2012-11-24 22:49:19 +01:00
commit 92a833604c
2 changed files with 5 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

6
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 ? ""
@ -47,7 +48,10 @@ python.stdenv.mkDerivation (attrs // {
buildInputStrings = map toString buildInputs; buildInputStrings = map toString buildInputs;
builder = ./builder.sh; configurePhase = ''
export PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}:$PYTHONPATH"
${configurePhase}
'';
pythonPath = [ setuptools] ++ pythonPath; pythonPath = [ setuptools] ++ pythonPath;