From 52c04b0347d60064f11ae8430e5a6c57a30ec831 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Wed, 13 May 2020 19:52:36 -0700 Subject: [PATCH] cpython: Use autoreconfHook to rebuild configure script. In particular this will let us use patches that apply to configure.ac. --- .../development/interpreters/python/cpython/2.7/default.nix | 6 ++++-- pkgs/development/interpreters/python/cpython/default.nix | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 0df49213f5a..e9d6c97cfd4 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -12,6 +12,7 @@ , zlib , self , configd, coreutils +, autoreconfHook , python-setup-hook # Some proprietary libs assume UCS2 unicode, especially on darwin :( , ucsEncoding ? 4 @@ -186,8 +187,9 @@ let ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ] ++ optional (stdenv.isDarwin && configd != null) configd; nativeBuildInputs = - optionals (stdenv.hostPlatform != stdenv.buildPlatform) - [ buildPackages.stdenv.cc buildPackages.python ]; + [ autoreconfHook ] + ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) + [ buildPackages.stdenv.cc buildPackages.python ]; mkPaths = paths: { C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 7dbe6216e72..b860e357b04 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -12,6 +12,7 @@ , zlib , self , configd +, autoreconfHook , python-setup-hook , nukeReferences # For the Python package set @@ -51,6 +52,7 @@ let version = with sourceVersion; "${major}.${minor}.${patch}${suffix}"; nativeBuildInputs = [ + autoreconfHook nukeReferences ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc