From 9007e57f281cc692c7ac2682c088d5e48b161d76 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Sun, 30 Jun 2013 09:49:55 +1000
Subject: [PATCH] python27: compile with tkinterp on darwin

---
 pkgs/development/interpreters/python/2.7/default.nix | 5 ++---
 pkgs/development/libraries/tk/default.nix            | 2 +-
 pkgs/top-level/all-packages.nix                      | 4 +++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index ccb423ef32e4..76ef7399812b 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2
-, sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm
-}:
+, sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm, libX11 }:
 
 assert zlibSupport -> zlib != null;
 
@@ -179,7 +178,7 @@ let
 
     tkinter = buildInternalPythonModule {
       moduleName = "tkinter";
-      deps = [ tcl tk x11 ];
+      deps = [ tcl tk x11 libX11 ];
     };
 
     readline = buildInternalPythonModule {
diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix
index 5cfd0d178eb6..a45c4217c7b6 100644
--- a/pkgs/development/libraries/tk/default.nix
+++ b/pkgs/development/libraries/tk/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A widget toolkit that provides a library of basic elements for building a GUI in many different programming languages";
     homepage = http://www.tcl.tk/;
-    maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ];
+    maintainers = with stdenv.lib.maintainers; [ lovek323 ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e03181907772..616909743668 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3094,7 +3094,9 @@ let
 
   python = python27;
   python26 = callPackage ../development/interpreters/python/2.6 { };
-  python27 = callPackage ../development/interpreters/python/2.7 { };
+  python27 = callPackage ../development/interpreters/python/2.7 {
+    libX11 = xlibs.libX11;
+  };
 
   pythonFull = python27Full;
   python26Full = callPackage ../development/interpreters/python/wrapper.nix {