* Apply r32435 from the trunk (always build Python with SSL support).

Remove .ssl references from some packages missed in that commit.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32469
This commit is contained in:
Eelco Dolstra
2012-02-21 23:35:35 +00:00
parent e64443baf1
commit f71dd91a43
12 changed files with 16 additions and 32 deletions

View File

@@ -38,7 +38,7 @@ let
buildInputs =
optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
[ bzip2 ]
[ bzip2 openssl ]
++ optional zlibSupport zlib
++ optionals stdenv.isDarwin [ darwinArchUtility darwinSwVersUtility ];
@@ -172,11 +172,6 @@ let
deps = [ sqlite ];
};
ssl = buildInternalPythonModule {
moduleName = "ssl";
deps = [ openssl ];
};
tkinter = buildInternalPythonModule {
moduleName = "tkinter";
deps = [ tcl tk x11 ];