ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 00:53:12 +03:00
Code Issues Projects Releases Wiki Activity

cpython: Use autoreconfHook to rebuild configure script.

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/interpreters/python/cpython/2.7/default.nix
View File

@ -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;

2
pkgs/development/interpreters/python/cpython/default.nix
View File

@ -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