diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2015-07-15 19:40:56 +0200 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2015-07-15 19:40:56 +0200 |
| commit | 1c5c4e91d7bccd436182ad71f4a59fcf8caa07c9 (patch) | |
| tree | 88ceb11fca70f7f28085f9383692879cf1f59dab /pkgs/development/interpreters/pypy | |
| parent | 25e60feb725f1ce58590a097ffe088bbf14717e2 (diff) | |
| download | nixlib-1c5c4e91d7bccd436182ad71f4a59fcf8caa07c9.tar nixlib-1c5c4e91d7bccd436182ad71f4a59fcf8caa07c9.tar.gz nixlib-1c5c4e91d7bccd436182ad71f4a59fcf8caa07c9.tar.bz2 nixlib-1c5c4e91d7bccd436182ad71f4a59fcf8caa07c9.tar.lz nixlib-1c5c4e91d7bccd436182ad71f4a59fcf8caa07c9.tar.xz nixlib-1c5c4e91d7bccd436182ad71f4a59fcf8caa07c9.tar.zst nixlib-1c5c4e91d7bccd436182ad71f4a59fcf8caa07c9.zip | |
pypy: fix build (ZHF)
Diffstat (limited to 'pkgs/development/interpreters/pypy')
| -rw-r--r-- | pkgs/development/interpreters/pypy/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/development/interpreters/pypy/setup-hook.sh | 4 |
2 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix index a453fd3e1a9e..0ff1c4317197 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 057e619ebc89..c82179d9e87b 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 |