forked from mirrors/nixpkgs
development/interpreters/python/2.7: Fix building on Linux 3.x (iirc, that was the problem).
svn path=/nixpkgs/trunk/; revision=29325
This commit is contained in:
parent
051b50143a
commit
cca42b5cc0
|
@ -30,6 +30,12 @@ let
|
||||||
./nix-store-mtime.patch
|
./nix-store-mtime.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace ./Lib/plat-generic/regen \
|
||||||
|
--replace /usr/include/netinet/in.h \
|
||||||
|
${stdenv.gcc.libc}/include/netinet/in.h
|
||||||
|
'';
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
|
optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
|
||||||
[ bzip2 ]
|
[ bzip2 ]
|
||||||
|
@ -49,7 +55,7 @@ let
|
||||||
python = stdenv.mkDerivation {
|
python = stdenv.mkDerivation {
|
||||||
name = "python-${version}";
|
name = "python-${version}";
|
||||||
|
|
||||||
inherit majorVersion version src patches buildInputs;
|
inherit majorVersion version src patches postPatch buildInputs;
|
||||||
|
|
||||||
C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
|
C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
|
||||||
LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
|
LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
|
||||||
|
@ -110,7 +116,7 @@ let
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "python-${moduleName}-${python.version}";
|
name = "python-${moduleName}-${python.version}";
|
||||||
|
|
||||||
inherit src patches;
|
inherit src patches postPatch;
|
||||||
|
|
||||||
buildInputs = [ python ] ++ deps;
|
buildInputs = [ python ] ++ deps;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue