forked from mirrors/nixpkgs
Python 2.6: add less
This commit is contained in:
parent
ae3896061b
commit
6b11c96c86
1 changed files with 5 additions and 3 deletions
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false
|
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, less, includeModules ? false
|
||||||
, sqlite, tcl, tk, xlibsWrapper, openssl, readline, db, ncurses, gdbm, self, callPackage
|
, sqlite, tcl, tk, xlibsWrapper, openssl, readline, db, ncurses, gdbm, self, callPackage
|
||||||
, python26Packages }:
|
, python26Packages }:
|
||||||
|
|
||||||
|
@ -53,6 +53,8 @@ let
|
||||||
[ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline xlibsWrapper tcl tk sqlite ]
|
[ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline xlibsWrapper tcl tk sqlite ]
|
||||||
++ optional zlibSupport zlib;
|
++ optional zlibSupport zlib;
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ less ];
|
||||||
|
|
||||||
mkPaths = paths: {
|
mkPaths = paths: {
|
||||||
C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths;
|
C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths;
|
||||||
LIBRARY_PATH = makeLibraryPath paths;
|
LIBRARY_PATH = makeLibraryPath paths;
|
||||||
|
@ -64,8 +66,8 @@ let
|
||||||
name = "python${if includeModules then "" else "-minimal"}-${version}";
|
name = "python${if includeModules then "" else "-minimal"}-${version}";
|
||||||
pythonVersion = majorVersion;
|
pythonVersion = majorVersion;
|
||||||
|
|
||||||
inherit majorVersion version src patches buildInputs preConfigure
|
inherit majorVersion version src patches buildInputs propagatedBuildInputs
|
||||||
configureFlags;
|
preConfigure configureFlags;
|
||||||
|
|
||||||
inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH;
|
inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue