diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-19 16:31:05 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-04-19 16:31:05 +0200 |
commit | 2b5e7bd2ba4bd9f16a7fb928100ba4d5f99ab378 (patch) | |
tree | b18e124f467afb7f5dca2cc0d0db10d4588e82da /pkgs/development/interpreters/python/2.6 | |
parent | e3ac73af1149ff92e4e9ed9de80a65b673bdb9c2 (diff) | |
download | nixlib-2b5e7bd2ba4bd9f16a7fb928100ba4d5f99ab378.tar nixlib-2b5e7bd2ba4bd9f16a7fb928100ba4d5f99ab378.tar.gz nixlib-2b5e7bd2ba4bd9f16a7fb928100ba4d5f99ab378.tar.bz2 nixlib-2b5e7bd2ba4bd9f16a7fb928100ba4d5f99ab378.tar.lz nixlib-2b5e7bd2ba4bd9f16a7fb928100ba4d5f99ab378.tar.xz nixlib-2b5e7bd2ba4bd9f16a7fb928100ba4d5f99ab378.tar.zst nixlib-2b5e7bd2ba4bd9f16a7fb928100ba4d5f99ab378.zip |
python2*: fix modules as well after 4101db0be
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.
Diffstat (limited to 'pkgs/development/interpreters/python/2.6')
-rw-r--r-- | pkgs/development/interpreters/python/2.6/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 787e3ea9e3b5..83787fdb1e24 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -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 { |