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

Conflicts:
	pkgs/development/python-modules/generic/default.nix

1 files changed, 5 insertions, 1 deletions

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index db5643427f8..32f050fec12 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9,7 +9,7 @@ let pythonPackages = python.modules // rec {
 
   buildPythonPackage = import ../development/python-modules/generic {
     inherit (pkgs) lib;
-    inherit python wrapPython setuptools;
+    inherit python wrapPython setuptools offlineDistutils;
   };
 
 
@@ -24,6 +24,10 @@ let pythonPackages = python.modules // rec {
     inherit python wrapPython;
   };
 
+  offlineDistutils = import ../development/python-modules/offline-distutils {
+    inherit (pkgs) stdenv;
+    inherit python;
+  };
 
   ipython = import ../shells/ipython {
     inherit (pkgs) stdenv fetchurl;