python27: compile with tkinterp on darwin

authored by Jason \"Don\" O'Conal and committed by Rok Garbas 9007e57f bd61c42d

+6 -5
+2 -3
pkgs/development/interpreters/python/2.7/default.nix
··· 1 1 { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2 2 - , sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm 3 - }: 2 + , sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm, libX11 }: 4 3 5 4 assert zlibSupport -> zlib != null; 6 5 ··· 179 178 180 179 tkinter = buildInternalPythonModule { 181 180 moduleName = "tkinter"; 182 - deps = [ tcl tk x11 ]; 181 + deps = [ tcl tk x11 libX11 ]; 183 182 }; 184 183 185 184 readline = buildInternalPythonModule {
+1 -1
pkgs/development/libraries/tk/default.nix
··· 27 27 meta = { 28 28 description = "A widget toolkit that provides a library of basic elements for building a GUI in many different programming languages"; 29 29 homepage = http://www.tcl.tk/; 30 - maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ]; 30 + maintainers = with stdenv.lib.maintainers; [ lovek323 ]; 31 31 platforms = stdenv.lib.platforms.all; 32 32 }; 33 33 }
+3 -1
pkgs/top-level/all-packages.nix
··· 3094 3094 3095 3095 python = python27; 3096 3096 python26 = callPackage ../development/interpreters/python/2.6 { }; 3097 - python27 = callPackage ../development/interpreters/python/2.7 { }; 3097 + python27 = callPackage ../development/interpreters/python/2.7 { 3098 + libX11 = xlibs.libX11; 3099 + }; 3098 3100 3099 3101 pythonFull = python27Full; 3100 3102 python26Full = callPackage ../development/interpreters/python/wrapper.nix {