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

Conflicts: pkgs/development/python-modules/generic/default.nix
2012-11-23 17:28:51 +01:00
parent dce76a387d ad8a4c73fa
commit ddbd5c2eba
4 changed files with 39 additions and 2 deletions
--- 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 }:
+{ python, setuptools, wrapPython, lib, offlineDistutils }:

 { name, namePrefix ? "python-"

@@ -47,6 +47,8 @@ python.stdenv.mkDerivation (attrs // {

  buildInputStrings = map toString buildInputs;

+  builder = ./builder.sh
+
  pythonPath = [ setuptools] ++ pythonPath;

  installPhase = ''