summary refs log tree commit diff
path: root/pkgs/development/interpreters/python
diff options
context:
space:
mode:
authorFlorian Friesdorf <flo@chaoflow.net>2014-08-12 12:29:21 +0200
committerDomen Kožar <domen@dev.si>2014-08-12 13:33:23 +0200
commit53490bd17e1b2c4d31081936ebf358ca567f92a9 (patch)
tree1865341cb507e74ba9e97b567515e5a787646c16 /pkgs/development/interpreters/python
parentbdea35d98bd53b78e1205bef85475aa6101e95bf (diff)
downloadnixpkgs-53490bd17e1b2c4d31081936ebf358ca567f92a9.tar
nixpkgs-53490bd17e1b2c4d31081936ebf358ca567f92a9.tar.gz
nixpkgs-53490bd17e1b2c4d31081936ebf358ca567f92a9.tar.bz2
nixpkgs-53490bd17e1b2c4d31081936ebf358ca567f92a9.tar.lz
nixpkgs-53490bd17e1b2c4d31081936ebf358ca567f92a9.tar.xz
nixpkgs-53490bd17e1b2c4d31081936ebf358ca567f92a9.tar.zst
nixpkgs-53490bd17e1b2c4d31081936ebf358ca567f92a9.zip
include ssl with python2.6 as is the case with 2.7
Signed-off-by: Domen Kožar <domen@dev.si>
Diffstat (limited to 'pkgs/development/interpreters/python')
-rw-r--r--pkgs/development/interpreters/python/2.6/default.nix7
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 940b667e86a..64e21b75569 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -30,7 +30,7 @@ let
 
   buildInputs =
     optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
-    [ bzip2 ]
+    [ bzip2 openssl ]
     ++ optional zlibSupport zlib;
 
 
@@ -178,10 +178,7 @@ let
       deps = [ sqlite ];
     };
 
-    ssl = buildInternalPythonModule {
-      moduleName = "ssl";
-      deps = [ openssl ];
-    };
+    ssl = null;
 
     tkinter = buildInternalPythonModule {
       moduleName = "tkinter";