public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18025 from knedlsepp/fix-python3.5-jupyter-1.0.0

Browse Source 
python3.5-jupyter: Fix build issue #17902
This commit is contained in:
Frederik Rietdijk 2016-09-10 11:28:48 +02:00 committed by GitHub
commit f6ccecefd9
5 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/interpreters/python/cpython/3.4/default.nix
View File

@ -60,6 +60,7 @@ stdenv.mkDerivation {
prePatch = optionalString stdenv.isDarwin '' prePatch = optionalString stdenv.isDarwin ''
substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
''; '';
preConfigure = '' preConfigure = ''

1
pkgs/development/interpreters/python/cpython/3.5/default.nix
View File

@ -57,6 +57,7 @@ stdenv.mkDerivation {
prePatch = optionalString stdenv.isDarwin '' prePatch = optionalString stdenv.isDarwin ''
substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
''; '';
preConfigure = '' preConfigure = ''

1
pkgs/development/interpreters/python/cpython/3.6/default.nix
View File

@ -61,6 +61,7 @@ stdenv.mkDerivation {
prePatch = optionalString stdenv.isDarwin '' prePatch = optionalString stdenv.isDarwin ''
substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
''; '';
preConfigure = '' preConfigure = ''

7
pkgs/development/python-modules/pygobject/3.nix
View File

@ -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 { mkPythonDerivation rec {
major = "3.20"; major = "3.20";
@ -10,12 +10,13 @@ mkPythonDerivation rec {
sha256 = "0ikzh3l7g1gjh8jj8vg6mdvrb25svp63gxcam4m0i404yh0lgari"; sha256 = "0ikzh3l7g1gjh8jj8vg6mdvrb25svp63gxcam4m0i404yh0lgari";
}; };
buildInputs = [ pkgconfig glib gobjectIntrospection ]; buildInputs = [ pkgconfig glib gobjectIntrospection ]
++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ];
propagatedBuildInputs = [ pycairo cairo ]; propagatedBuildInputs = [ pycairo cairo ];
meta = { meta = {
homepage = http://live.gnome.org/PyGObject; homepage = http://live.gnome.org/PyGObject;
description = "Python bindings for Glib"; description = "Python bindings for Glib";
platforms = lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
}; };
} }

14
pkgs/development/python-modules/pyqt/4.x.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus_libs, makeWrapper }: { stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus_libs, makeWrapper }:
let let
version = "4.11.3"; version = "4.11.3";
@ -17,9 +17,15 @@ in mkPythonDerivation {
rm -rf "$out/nix-support" rm -rf "$out/nix-support"
export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages 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 \ 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=( \ configureFlagsArray=( \
--confirm-license --bindir $out/bin \ --confirm-license --bindir $out/bin \
@ -50,7 +56,7 @@ in mkPythonDerivation {
description = "Python bindings for Qt"; description = "Python bindings for Qt";
license = "GPL"; license = "GPL";
homepage = http://www.riverbankcomputing.co.uk; homepage = http://www.riverbankcomputing.co.uk;
maintainers = [ lib.maintainers.sander ]; maintainers = [ stdenv.lib.maintainers.sander ];
platforms = lib.platforms.mesaPlatforms; platforms = stdenv.lib.platforms.mesaPlatforms;
}; };
} }