From 1c5c4e91d7bccd436182ad71f4a59fcf8caa07c9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 15 Jul 2015 19:40:56 +0200 Subject: [PATCH] pypy: fix build (ZHF) --- pkgs/development/interpreters/pypy/default.nix | 15 ++++++++++++--- pkgs/development/interpreters/pypy/setup-hook.sh | 4 ++-- .../python-modules/setuptools/default.nix | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix index a453fd3e1a9..0ff1c431719 100644 --- a/pkgs/development/interpreters/pypy/default.nix +++ b/pkgs/development/interpreters/pypy/default.nix @@ -49,16 +49,25 @@ let --replace "libraries=['curses']" "libraries=['ncurses']" # tkinter hints - substituteInPlace lib_pypy/_tkinter/tklib.py \ + substituteInPlace lib_pypy/_tkinter/tklib_build.py \ --replace "'/usr/include/tcl'" "'${tk}/include', '${tcl}/include'" \ - --replace "linklibs=['tcl', 'tk']" "linklibs=['${tcl.libPrefix}', '${tk.libPrefix}']" \ + --replace "linklibs = ['tcl' + _ver, 'tk' + _ver]" "linklibs=['${tcl.libPrefix}', '${tk.libPrefix}']" \ --replace "libdirs = []" "libdirs = ['${tk}/lib', '${tcl}/lib']" - sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite}/include'], library_dirs=['${sqlite}/lib']@" lib_pypy/_sqlite3.py + sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite}/include'], library_dirs=['${sqlite}/lib']@" lib_pypy/_sqlite3_build.py ''; setupHook = ./setup-hook.sh; + postBuild = '' + cd ./lib_pypy + ../pypy-c ./_audioop_build.py + ../pypy-c ./_curses_build.py + ../pypy-c ./_sqlite3_build.py + ../pypy-c ./_tkinter/tklib_build.py + cd .. + ''; + doCheck = true; checkPhase = '' export TERMINFO="${ncurses}/share/terminfo/"; diff --git a/pkgs/development/interpreters/pypy/setup-hook.sh b/pkgs/development/interpreters/pypy/setup-hook.sh index 057e619ebc8..c82179d9e87 100644 --- a/pkgs/development/interpreters/pypy/setup-hook.sh +++ b/pkgs/development/interpreters/pypy/setup-hook.sh @@ -1,12 +1,12 @@ addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.5/site-packages + addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.6/site-packages } toPythonPath() { local paths="$1" local result= for i in $paths; do - p="$i/lib/pypy2.5/site-packages" + p="$i/lib/pypy2.6/site-packages" result="${result}${result:+:}$p" done echo $result diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 01fe4668679..5db34a9d49d 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { '' dst=$out/lib/${python.libPrefix}/site-packages mkdir -p $dst - PYTHONPATH="$dst:$PYTHONPATH" + export PYTHONPATH="$dst:$PYTHONPATH" ${python}/bin/${python.executable} setup.py install --prefix=$out --install-lib=$out/lib/${python.libPrefix}/site-packages wrapPythonPrograms '';