diff options
author | Peter Simons <simons@cryp.to> | 2012-02-20 18:52:52 +0000 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2012-02-20 18:52:52 +0000 |
commit | 95cbf4ed555669bea9f0ea37678665db452c2cd8 (patch) | |
tree | 20db6ccbc9f30f427de319d13fff26966c214de5 /pkgs/development/interpreters | |
parent | 3a414e0292b834aec9be37d91a70a721f67463ce (diff) | |
download | nixpkgs-95cbf4ed555669bea9f0ea37678665db452c2cd8.tar nixpkgs-95cbf4ed555669bea9f0ea37678665db452c2cd8.tar.gz nixpkgs-95cbf4ed555669bea9f0ea37678665db452c2cd8.tar.bz2 nixpkgs-95cbf4ed555669bea9f0ea37678665db452c2cd8.tar.lz nixpkgs-95cbf4ed555669bea9f0ea37678665db452c2cd8.tar.xz nixpkgs-95cbf4ed555669bea9f0ea37678665db452c2cd8.tar.zst nixpkgs-95cbf4ed555669bea9f0ea37678665db452c2cd8.zip |
Modified the Python 2.7 expression so that the interpreter has unconditional
OpenSSL support. Having OpenSSL available at the time the core interpreter is built enables all kinds of important crypto features (i.e. additional hashlib algorithms, etc.) that otherwise won't be available. svn path=/nixpkgs/trunk/; revision=32435
Diffstat (limited to 'pkgs/development/interpreters')
-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 1c8ae0cf171..635d50dc5b3 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 ]; |