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

python2*: fix modules as well after 4101db0be

Browse Source 
There was a typo that failed them.
Also, drop pkgconfig again, as it seems unused; and fix python26.

Now all python*.modules build, except for python26.tkinter
which fails on master as well.
This commit is contained in:
Vladimír Čunát 2015-04-19 16:31:05 +02:00
parent e3ac73af11
commit 2b5e7bd2ba
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/interpreters/python/2.6/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false
, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, self, callPackage }:
assert zlibSupport -> zlib != null;
@ -48,12 +48,12 @@ let
buildInputs =
optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++
[ pkgconfig bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline x11 tcl tk sqlite ]
[ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline x11 tcl tk sqlite ]
++ optional zlibSupport zlib;
mkPaths = paths: {
C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p.dev or p}/include") buildInputs);
LIBRARY_PATH = concatStringsSep ":" (map (p: "${p.lib or (p.out or p)}/lib") buildInputs);
C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p.dev or p}/include") paths);
LIBRARY_PATH = concatStringsSep ":" (map (p: "${p.lib or (p.out or p)}/lib") paths);
};
# Build the basic Python interpreter without modules that have
@ -90,8 +90,6 @@ let
paxmark E $out/bin/python${majorVersion}
${ optionalString includeModules "$out/bin/python ./setup.py build_ext"}
rm "$out/lib/python2.7/plat-linux2/regen" # refers to glibc.dev
'';
passthru = rec {

10
pkgs/development/interpreters/python/2.7/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, self, callPackage
{ stdenv, fetchurl, self, callPackage
, bzip2, openssl
, includeModules ? false
@ -60,7 +60,7 @@ let
buildInputs =
optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++
[ pkgconfig bzip2 openssl ]
[ bzip2 openssl ]
++ optionals includeModules (
[ db gdbm ncurses sqlite readline
] ++ optionals x11Support [ tcl tk x11 libX11 ]
@ -68,8 +68,8 @@ let
++ optional zlibSupport zlib;
mkPaths = paths: {
C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p.dev or p}/include") buildInputs);
LIBRARY_PATH = concatStringsSep ":" (map (p: "${p.lib or (p.out or p)}/lib") buildInputs);
C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p.dev or p}/include") paths);
LIBRARY_PATH = concatStringsSep ":" (map (p: "${p.lib or (p.out or p)}/lib") paths);
};
# Build the basic Python interpreter without modules that have
@ -110,7 +110,7 @@ let
${ optionalString includeModules "$out/bin/python ./setup.py build_ext"}
rm "$out/lib/python2.7/plat-linux2/regen" # refers to glibc.dev
rm "$out"/lib/python*/plat-linux2/regen # refers to glibc.dev
'';
passthru = rec {