diff options
| author | Greg Price <gnprice@gmail.com> | 2020-05-13 19:52:36 -0700 |
|---|---|---|
| committer | Greg Price <gnprice@gmail.com> | 2020-05-13 21:23:48 -0700 |
| commit | 52c04b0347d60064f11ae8430e5a6c57a30ec831 (patch) | |
| tree | 05c3b4a9acb4a91b2cfe914a3de4b5b542d72c16 /pkgs/development/interpreters/python/cpython | |
| parent | f8a8243bd3127ba9c6090d57f43d979389c1653c (diff) | |
| download | nixlib-52c04b0347d60064f11ae8430e5a6c57a30ec831.tar nixlib-52c04b0347d60064f11ae8430e5a6c57a30ec831.tar.gz nixlib-52c04b0347d60064f11ae8430e5a6c57a30ec831.tar.bz2 nixlib-52c04b0347d60064f11ae8430e5a6c57a30ec831.tar.lz nixlib-52c04b0347d60064f11ae8430e5a6c57a30ec831.tar.xz nixlib-52c04b0347d60064f11ae8430e5a6c57a30ec831.tar.zst nixlib-52c04b0347d60064f11ae8430e5a6c57a30ec831.zip | |
cpython: Use autoreconfHook to rebuild configure script.
In particular this will let us use patches that apply to configure.ac.
Diffstat (limited to 'pkgs/development/interpreters/python/cpython')
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/default.nix | 6 | ||||
| -rw-r--r-- | 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 0df49213f5a3..e9d6c97cfd45 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 7dbe6216e728..b860e357b04b 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 |