diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-09-10 11:28:48 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-10 11:28:48 +0200 |
commit | f6ccecefd9e1082835a7520c92b98ce29ce95d5e (patch) | |
tree | f82e0519fac1088d42b0becd7bf926f3cd9fb951 /pkgs | |
parent | 9c0b11e7cdb943fe40f399012a96413e48726655 (diff) | |
parent | d12de90e1c0cece5b7a92cd66af19e12b9fb6a81 (diff) |
Merge pull request #18025 from knedlsepp/fix-python3.5-jupyter-1.0.0
python3.5-jupyter: Fix build issue #17902
Diffstat (limited to 'pkgs')
5 files changed, 17 insertions, 7 deletions
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 2293e6d485a9c..2e7d3a03141ea 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 1b6814ea4363c..69d3df32a326c 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 2c18464420706..3a6635cd8b621 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 = '' diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 43882476b9d5e..797d89fd4822d 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, mkPythonDerivation, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo }: +{ stdenv, fetchurl, mkPythonDerivation, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}: mkPythonDerivation rec { major = "3.20"; @@ -10,12 +10,13 @@ mkPythonDerivation rec { sha256 = "0ikzh3l7g1gjh8jj8vg6mdvrb25svp63gxcam4m0i404yh0lgari"; }; - buildInputs = [ pkgconfig glib gobjectIntrospection ]; + buildInputs = [ pkgconfig glib gobjectIntrospection ] + ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ]; propagatedBuildInputs = [ pycairo cairo ]; meta = { homepage = http://live.gnome.org/PyGObject; description = "Python bindings for Glib"; - platforms = lib.platforms.unix; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 178a4ba74a7a5..73835fedcd42c 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus_libs, makeWrapper }: +{ stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus_libs, makeWrapper }: let version = "4.11.3"; @@ -17,9 +17,15 @@ in mkPythonDerivation { rm -rf "$out/nix-support" export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages + ${stdenv.lib.optionalString stdenv.isDarwin '' + export QMAKESPEC="unsupported/macx-clang-libc++" # OS X target after bootstrapping phase \ + ''} substituteInPlace configure.py \ - --replace 'install_dir=pydbusmoddir' "install_dir='$out/lib/${python.libPrefix}/site-packages/dbus/mainloop'" + --replace 'install_dir=pydbusmoddir' "install_dir='$out/lib/${python.libPrefix}/site-packages/dbus/mainloop'" \ + ${stdenv.lib.optionalString stdenv.isDarwin '' + --replace "qt_macx_spec = 'macx-g++'" "qt_macx_spec = 'unsupported/macx-clang-libc++'" # for bootstrapping phase \ + ''} configureFlagsArray=( \ --confirm-license --bindir $out/bin \ @@ -50,7 +56,7 @@ in mkPythonDerivation { description = "Python bindings for Qt"; license = "GPL"; homepage = http://www.riverbankcomputing.co.uk; - maintainers = [ lib.maintainers.sander ]; - platforms = lib.platforms.mesaPlatforms; + maintainers = [ stdenv.lib.maintainers.sander ]; + platforms = stdenv.lib.platforms.mesaPlatforms; }; } |