mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-29 02:13:23 +00:00
Merge branch 'py/offline-distutils' into python-merge
Conflicts: pkgs/development/python-modules/generic/builder.sh pkgs/development/python-modules/generic/default.nix
This commit is contained in:
commit
92a833604c
@ -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
|
@ -32,6 +32,7 @@
|
||||
python setup.py test
|
||||
runHook postCheck
|
||||
''
|
||||
, configurePhase ? "true"
|
||||
|
||||
, postInstall ? ""
|
||||
|
||||
@ -47,7 +48,10 @@ python.stdenv.mkDerivation (attrs // {
|
||||
|
||||
buildInputStrings = map toString buildInputs;
|
||||
|
||||
builder = ./builder.sh;
|
||||
configurePhase = ''
|
||||
export PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}:$PYTHONPATH"
|
||||
${configurePhase}
|
||||
'';
|
||||
|
||||
pythonPath = [ setuptools] ++ pythonPath;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user