diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-02-21 23:35:35 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-02-21 23:35:35 +0000 |
| commit | f71dd91a438f8777c90b3df27b1509d2508e580d (patch) | |
| tree | 1e932d8502e3b168d2970cd44faddfc9e39c3567 /pkgs/development/interpreters/python/2.7 | |
| parent | e64443baf1f78b62ebd4db5354b348bd3a280c01 (diff) | |
| download | nixlib-f71dd91a438f8777c90b3df27b1509d2508e580d.tar nixlib-f71dd91a438f8777c90b3df27b1509d2508e580d.tar.gz nixlib-f71dd91a438f8777c90b3df27b1509d2508e580d.tar.bz2 nixlib-f71dd91a438f8777c90b3df27b1509d2508e580d.tar.lz nixlib-f71dd91a438f8777c90b3df27b1509d2508e580d.tar.xz nixlib-f71dd91a438f8777c90b3df27b1509d2508e580d.tar.zst nixlib-f71dd91a438f8777c90b3df27b1509d2508e580d.zip | |
* 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
Diffstat (limited to 'pkgs/development/interpreters/python/2.7')
| -rw-r--r-- | pkgs/development/interpreters/python/2.7/default.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 1c8ae0cf171a..635d50dc5b3e 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 ] + [ 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 ]; |