* Revert r32435. We'll be doing a stdenv merge in a few days, so

  let's put it in there rather than having the Nth near-complete
  rebuild of the trunk in a few days.

svn path=/nixpkgs/trunk/; revision=32436

1 files changed, 6 insertions, 1 deletions

diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 635d50dc5b3..1c8ae0cf171 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -38,7 +38,7 @@ let
 
   buildInputs =
     optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
-    [ bzip2 openssl ]
+    [ bzip2 ]
     ++ optional zlibSupport zlib
     ++ optionals stdenv.isDarwin [ darwinArchUtility darwinSwVersUtility ];
 
@@ -172,6 +172,11 @@ let
       deps = [ sqlite ];
     };
 
+    ssl = buildInternalPythonModule {
+      moduleName = "ssl";
+      deps = [ openssl ];
+    };
+
     tkinter = buildInternalPythonModule {
       moduleName = "tkinter";
       deps = [ tcl tk x11 ];