mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-20 12:42:24 +00:00
Added Tk support for Python
svn path=/nixpkgs/trunk/; revision=13526
This commit is contained in:
parent
18501e572a
commit
d6f1d7acb3
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue