diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2022-02-06 13:33:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-06 13:33:59 +0100 |
| commit | e3ae569a2ce0fb58890a84faf9e0100c84edce93 (patch) | |
| tree | e17b32595c0eb7fdf13bb906bcffc579de773a16 /pkgs/development/interpreters/python | |
| parent | 7b084b3ae37c65de123c1ce1659a9ed685ad0e1c (diff) | |
| parent | 68d828f64ca8cde5dbe85c55ca6563f92482cd4e (diff) | |
Merge pull request #157775 from veprbl/pr/darwin_python310_fix
python3: revert some old darwin hacks
Diffstat (limited to 'pkgs/development/interpreters/python')
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/default.nix | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 1bcbd2bb4b5e9..02ecf8d25b1ef 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -191,7 +191,6 @@ in with passthru; stdenv.mkDerivation { prePatch = optionalString stdenv.isDarwin '' substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' - substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' ' '' + optionalString (pythonOlder "3.9" && stdenv.isDarwin && x11Support) '' # Broken on >= 3.9; replaced with ./3.9/darwin-tcl-tk.patch substituteInPlace setup.py --replace /Library/Frameworks /no-such-path @@ -342,8 +341,6 @@ in with passthru; stdenv.mkDerivation { substituteInPlace ./setup.py --replace $i /no-such-path done '' + optionalString stdenv.isDarwin '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2" - export MACOSX_DEPLOYMENT_TARGET=10.6 # Override the auto-detection in setup.py, which assumes a universal build export PYTHON_DECIMAL_WITH_MACHINE=${if stdenv.isAarch64 then "uint128" else "x64"} '' + optionalString (isPy3k && pythonOlder "3.7") '' |