alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Added Tk support for Python

Browse source 
svn path=/nixpkgs/trunk/; revision=13526
This commit is contained in:
Michael Raskin 2008-12-01 00:02:25 +00:00
parent 18501e572a
commit d6f1d7acb3
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/interpreters/python/2.5/default.nix
View file

@ -4,6 +4,10 @@
, db4 ? null , db4 ? null
, readline ? null , readline ? null
, openssl ? null , openssl ? null
, tk ? null
, tcl ? null
, libX11 ? null
, xproto ? null
}: }:
assert zlibSupport -> zlib != null; assert zlibSupport -> zlib != null;
@ -22,6 +26,10 @@ let
++ optional (db4 != null) db4 ++ optional (db4 != null) db4
++ optional (readline != null) readline ++ optional (readline != null) readline
++ optional (openssl != null) openssl ++ optional (openssl != null) openssl
++ optional (tk != null) tk
++ optional (tcl != null) tcl
++ optional (libX11 != null) libX11
++ optional (xproto != null) xproto
; ;
in in
@ -66,6 +74,7 @@ stdenv.mkDerivation {
db4Support = db4 != null; db4Support = db4 != null;
readlineSupport = readline != null; readlineSupport = readline != null;
opensslSupport = openssl != null; opensslSupport = openssl != null;
tkSupport = (tk != null) && (tcl != null);
libPrefix = "python2.5"; libPrefix = "python2.5";
}; };
} }

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

@ -2075,6 +2075,10 @@ let
sqlite = if getConfig ["python" "sqliteSupport"] true then sqlite else null; sqlite = if getConfig ["python" "sqliteSupport"] true then sqlite else null;
readline = if getConfig ["python" "readlineSupport"] true then readline else null; readline = if getConfig ["python" "readlineSupport"] true then readline else null;
openssl = if getConfig ["python" "opensslSupport"] true then openssl 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; pyrex = pyrex095;