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

pypy: parallel build improvements, remove some patching

Browse Source 
incorporates http://paste.pound-python.org/show/oFyMaSSzvb07lenWYmAK/
from NixCon sprints
This commit is contained in:
Domen Kožar 2016-01-11 20:40:49 +01:00
parent da698fd9da
commit 5c2c881c57
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/interpreters/pypy/default.nix
View File

@ -31,16 +31,6 @@ let
(stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs)); (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs));
preConfigure = '' preConfigure = ''
substituteInPlace Makefile \
--replace "-Ojit" "-Ojit --batch" \
--replace "pypy/goal/targetpypystandalone.py" "pypy/goal/targetpypystandalone.py --withmod-_minimal_curses --withmod-unicodedata --withmod-thread --withmod-bz2 --withmod-_multiprocessing"
# we are using cpython and not pypy to do translation
substituteInPlace rpython/bin/rpython \
--replace "/usr/bin/env pypy" "${pythonFull}/bin/python"
substituteInPlace pypy/goal/targetpypystandalone.py \
--replace "/usr/bin/env pypy" "${pythonFull}/bin/python"
# hint pypy to find nix ncurses # hint pypy to find nix ncurses
substituteInPlace pypy/module/_minimal_curses/fficurses.py \ substituteInPlace pypy/module/_minimal_curses/fficurses.py \
--replace "/usr/include/ncurses/curses.h" "${ncurses}/include/curses.h" \ --replace "/usr/include/ncurses/curses.h" "${ncurses}/include/curses.h" \
@ -57,6 +47,10 @@ let
sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite}/include'], library_dirs=['${sqlite}/lib']@" lib_pypy/_sqlite3_build.py sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite}/include'], library_dirs=['${sqlite}/lib']@" lib_pypy/_sqlite3_build.py
''; '';
buildPhase = ''
${pythonFull.interpreter} rpython/bin/rpython --make-jobs="$NIX_BUILD_CORES" -Ojit --batch pypy/goal/targetpypystandalone.py --withmod-_minimal_curses --withmod-unicodedata --withmod-thread --withmod-bz2 --withmod-_multiprocessing
'';
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
postBuild = '' postBuild = ''