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

Revert "Python 2.6: add less" 

This reverts commit 6b11c96c86.
This commit is contained in:
Eelco Dolstra 2016-09-01 18:58:14 +02:00
parent 1e370d7de4
commit 7f520bdad8
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/interpreters/python/cpython/2.6/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, less, includeModules ? false { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, 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,8 +53,6 @@ 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;
@ -66,8 +64,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 propagatedBuildInputs inherit majorVersion version src patches buildInputs preConfigure
preConfigure configureFlags; configureFlags;
inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH; inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH;