cpython: Use autoreconfHook to rebuild configure script.

In particular this will let us use patches that apply to configure.ac.
This commit is contained in:
Greg Price 2020-05-13 19:52:36 -07:00
parent f8a8243bd3
commit 52c04b0347
2 changed files with 6 additions and 2 deletions

View File

@ -12,6 +12,7 @@
, zlib , zlib
, self , self
, configd, coreutils , configd, coreutils
, autoreconfHook
, python-setup-hook , python-setup-hook
# Some proprietary libs assume UCS2 unicode, especially on darwin :( # Some proprietary libs assume UCS2 unicode, especially on darwin :(
, ucsEncoding ? 4 , ucsEncoding ? 4
@ -186,7 +187,8 @@ let
++ optionals x11Support [ tcl tk xlibsWrapper libX11 ] ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ]
++ optional (stdenv.isDarwin && configd != null) configd; ++ optional (stdenv.isDarwin && configd != null) configd;
nativeBuildInputs = nativeBuildInputs =
optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ autoreconfHook ]
++ optionals (stdenv.hostPlatform != stdenv.buildPlatform)
[ buildPackages.stdenv.cc buildPackages.python ]; [ buildPackages.stdenv.cc buildPackages.python ];
mkPaths = paths: { mkPaths = paths: {

View File

@ -12,6 +12,7 @@
, zlib , zlib
, self , self
, configd , configd
, autoreconfHook
, python-setup-hook , python-setup-hook
, nukeReferences , nukeReferences
# For the Python package set # For the Python package set
@ -51,6 +52,7 @@ let
version = with sourceVersion; "${major}.${minor}.${patch}${suffix}"; version = with sourceVersion; "${major}.${minor}.${patch}${suffix}";
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook
nukeReferences nukeReferences
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
buildPackages.stdenv.cc buildPackages.stdenv.cc