JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

python27: compile with tkinterp on darwin

Browse Source
This commit is contained in:
Jason \"Don\" O'Conal 2013-06-30 09:49:55 +10:00 committed by Rok Garbas
parent bd61c42d22
commit 9007e57f28
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/interpreters/python/2.7/default.nix
View File

@ -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 {

2
pkgs/development/libraries/tk/default.nix
View File

@ -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;
};
}

4
pkgs/top-level/all-packages.nix
View File

@ -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 {