From ff25c5e21a6c7e2f8a02e90f91b577adf2d60a8c Mon Sep 17 00:00:00 2001 From: Josef Kemetmueller Date: Fri, 26 Aug 2016 23:12:24 +0200 Subject: [PATCH] python3.x: Patch extra stack size on darwin Compiling python with "-Wl,-stack_size,1000000" causes problems when compiling for example pygobject3. pygobject3 uses "python3.x-config --ldflags" during installation and then fails when "-Wl,-stack_size,1000000" is present. Maybe we should investigate removing this during the build of pyobject3, but this stack_size flag is also not used on the popular darwin homebrew-core channel for python3.5, so it seems safe to remove it. (cherry picked from commit b7819e38c4a7487a0d09bdf64275a246bf29a8e2) --- pkgs/development/interpreters/python/cpython/3.4/default.nix | 1 + pkgs/development/interpreters/python/cpython/3.5/default.nix | 1 + pkgs/development/interpreters/python/cpython/3.6/default.nix | 1 + 3 files changed, 3 insertions(+) diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 2293e6d485a9..2e7d3a03141e 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation { prePatch = optionalString stdenv.isDarwin '' substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' + substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' ' ''; preConfigure = '' diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index 1b6814ea4363..69d3df32a326 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation { prePatch = optionalString stdenv.isDarwin '' substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' + substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' ' ''; preConfigure = '' diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 2c1846442070..3a6635cd8b62 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation { prePatch = optionalString stdenv.isDarwin '' substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' + substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' ' ''; preConfigure = ''