diff options
| author | Marc Weber <marco-oweber@gmx.de> | 2010-05-09 14:33:50 +0000 |
|---|---|---|
| committer | Marc Weber <marco-oweber@gmx.de> | 2010-05-09 14:33:50 +0000 |
| commit | 3303106e97a75327e1d69122346f8aa29cce2416 (patch) | |
| tree | 12ca5ffce3557bb5450739602495807e227a7677 /pkgs/development/interpreters/python | |
| parent | 258d886a1735311d18ca929f653f2b1070b3a48d (diff) | |
| download | nixlib-3303106e97a75327e1d69122346f8aa29cce2416.tar nixlib-3303106e97a75327e1d69122346f8aa29cce2416.tar.gz nixlib-3303106e97a75327e1d69122346f8aa29cce2416.tar.bz2 nixlib-3303106e97a75327e1d69122346f8aa29cce2416.tar.lz nixlib-3303106e97a75327e1d69122346f8aa29cce2416.tar.xz nixlib-3303106e97a75327e1d69122346f8aa29cce2416.tar.zst nixlib-3303106e97a75327e1d69122346f8aa29cce2416.zip | |
python: support ncurses, replace composedArgsAndFun by makeOverridable
because composedArgsAndFun didn't pass values to the builder svn path=/nixpkgs/trunk/; revision=21686
Diffstat (limited to 'pkgs/development/interpreters/python')
| -rw-r--r-- | pkgs/development/interpreters/python/2.5/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/2.6/default.nix | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/python/2.5/default.nix b/pkgs/development/interpreters/python/2.5/default.nix index 97a307be1223..33aa66d765d2 100644 --- a/pkgs/development/interpreters/python/2.5/default.nix +++ b/pkgs/development/interpreters/python/2.5/default.nix @@ -8,6 +8,7 @@ , tcl ? null , libX11 ? null , xproto ? null +, ncurses ? null }: assert zlibSupport -> zlib != null; @@ -30,6 +31,8 @@ let ++ optional (tcl != null) tcl ++ optional (libX11 != null) libX11 ++ optional (xproto != null) xproto + ++ optional (xproto != null) xproto + ++ optional (ncurses != null) ncurses ; in diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 88e9c32a808f..8865738b0d75 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -10,6 +10,7 @@ , xproto ? null , arch ? null , sw_vers ? null +, ncurses ? null }: assert zlibSupport -> zlib != null; @@ -39,6 +40,7 @@ let ++ optional (xproto != null) xproto ++ optional (arch != null) arch ++ optional (sw_vers != null) sw_vers + ++ optional (ncurses != null) ncurses ; in |