From 99c9108757ddc3539fcc1c7b5695bd9544ae4e35 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 26 May 2008 12:27:17 +0000 Subject: [PATCH] OpenSSL support for Python svn path=/nixpkgs/trunk/; revision=11894 --- pkgs/development/interpreters/python/2.5/default.nix | 3 +++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+) diff --git a/pkgs/development/interpreters/python/2.5/default.nix b/pkgs/development/interpreters/python/2.5/default.nix index ee13a8dceb80..0944f79618c5 100644 --- a/pkgs/development/interpreters/python/2.5/default.nix +++ b/pkgs/development/interpreters/python/2.5/default.nix @@ -3,6 +3,7 @@ , sqlite ? null , db4 ? null , readline ? null + , openssl ? null }: assert zlibSupport -> zlib != null; @@ -20,6 +21,7 @@ let ++ optional (sqlite != null) sqlite ++ optional (db4 != null) db4 ++ optional (readline != null) readline + ++ optional (openssl != null) openssl ; in @@ -63,6 +65,7 @@ stdenv.mkDerivation { sqliteSupport = sqlite != null; db4Support = db4 != null; readlineSupport = readline != null; + opensslSupport = openssl != null; libPrefix = "python2.5"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b6e1ffa793e..441df72f93a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1839,6 +1839,7 @@ let pkgs = rec { db4 = if getConfig ["python" "db4Support"] false then db4 else null; sqlite = if getConfig ["python" "sqlite"] false then sqlite else null; readline = if getConfig ["python" "readlineSupport"] false then readline else null; + openssl = if getConfig ["python" "opensslSupport"] false then openssl else null; } null; pyrex = pyrex095;