From d6f1d7acb3e6aab474e17a744418edf671da9fe0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 1 Dec 2008 00:02:25 +0000
Subject: [PATCH] Added Tk support for Python

svn path=/nixpkgs/trunk/; revision=13526
---
 pkgs/development/interpreters/python/2.5/default.nix | 9 +++++++++
 pkgs/top-level/all-packages.nix                      | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/pkgs/development/interpreters/python/2.5/default.nix b/pkgs/development/interpreters/python/2.5/default.nix
index bfbc421e1156..7b009bbe0c0a 100644
--- a/pkgs/development/interpreters/python/2.5/default.nix
+++ b/pkgs/development/interpreters/python/2.5/default.nix
@@ -4,6 +4,10 @@
 , db4 ? null
 , readline ? null
 , openssl ? null
+, tk ? null
+, tcl ? null
+, libX11 ? null
+, xproto ? null
 }:
 
 assert zlibSupport -> zlib != null;
@@ -22,6 +26,10 @@ let
     ++ optional (db4 != null) db4
     ++ optional (readline != null) readline
     ++ optional (openssl != null) openssl
+    ++ optional (tk != null) tk
+    ++ optional (tcl != null) tcl
+    ++ optional (libX11 != null) libX11
+    ++ optional (xproto != null) xproto
     ;
 
 in
@@ -66,6 +74,7 @@ stdenv.mkDerivation {
     db4Support = db4 != null;
     readlineSupport = readline != null;
     opensslSupport = openssl != null;
+    tkSupport = (tk != null) && (tcl != null);
     libPrefix = "python2.5";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0dbcfa58a203..3a5224c39ed1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2075,6 +2075,10 @@ let
     sqlite = if getConfig ["python" "sqliteSupport"] true then sqlite else null;
     readline = if getConfig ["python" "readlineSupport"] true then readline else null;
     openssl = if getConfig ["python" "opensslSupport"] true then openssl else null;
+    tk = if getConfig ["python" "tkSupport"] true then tk else null;
+    tcl = if getConfig ["python" "tkSupport"] true then tcl else null;
+    libX11 = if getConfig ["python" "tkSupport"] true then xlibs.libX11 else null;
+    xproto = if getConfig ["python" "tkSupport"] true then xlibs.xproto else null;
   };
 
   pyrex = pyrex095;