diff options
author | Rob Vermaas <rob.vermaas@gmail.com> | 2013-07-25 13:42:20 +0200 |
---|---|---|
committer | Rob Vermaas <rob.vermaas@gmail.com> | 2013-07-25 13:42:20 +0200 |
commit | a8f11fcba5e296897388e1eb747749e4e7517ce7 (patch) | |
tree | d6375969783a8413d0a8ebdf747e57c2a1bbb447 /pkgs/development/interpreters | |
parent | 7a6b6799d9583e61b93971e9f107085d4eb932a2 (diff) | |
download | nixlib-a8f11fcba5e296897388e1eb747749e4e7517ce7.tar nixlib-a8f11fcba5e296897388e1eb747749e4e7517ce7.tar.gz nixlib-a8f11fcba5e296897388e1eb747749e4e7517ce7.tar.bz2 nixlib-a8f11fcba5e296897388e1eb747749e4e7517ce7.tar.lz nixlib-a8f11fcba5e296897388e1eb747749e4e7517ce7.tar.xz nixlib-a8f11fcba5e296897388e1eb747749e4e7517ce7.tar.zst nixlib-a8f11fcba5e296897388e1eb747749e4e7517ce7.zip |
Update pypy build with sqlite and expat support. Fix the installPhase.
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/pypy/2.0/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix index d903dab02c03..6be1b5a2b7d3 100644 --- a/pkgs/development/interpreters/pypy/2.0/default.nix +++ b/pkgs/development/interpreters/pypy/2.0/default.nix @@ -18,10 +18,14 @@ let sha256 = "0g2cajs6m3yf0lak5f18ccs6j77cf5xvbm4h6y5l1qlqdc6wk48r"; }; - buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses sqlite ] + buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite ] ++ stdenv.lib.optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ stdenv.lib.optional zlibSupport zlib; + C_INCLUDE_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/include") buildInputs); + LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib") buildInputs); + LD_LIBRARY_PATH = LIBRARY_PATH; + preConfigure = '' substituteInPlace Makefile \ --replace "-Ojit" "-Ojit --batch" \ @@ -39,10 +43,6 @@ let --replace "ncurses/curses.h" "${ncurses}/include/curses.h" \ --replace "ncurses/term.h" "${ncurses}/include/term.h" \ --replace "libraries = ['curses']" "libraries = ['ncurses']" - - #substituteInPlace rpython/translator/platform/__init__.py \ - # --replace "return include_dirs" "return tuple(\"{expat}\", *include_dirs)" \ - # --replace "return library_dirs" "return tuple(\"{expat}\", *library_dirs)" ''; TERMINFO = "${ncurses}/share/terminfo/"; @@ -55,8 +55,9 @@ let installPhase = '' mkdir -p $out/bin - cp -R {include,lib_pypy,lib-python,pypy-c} $out/ - ln -s $out/pypy-c $out/bin/pypy + mkdir -p $out/pypy-c + cp -R {include,lib_pypy,lib-python,pypy-c} $out/pypy-c + ln -s $out/pypy-c/pypy-c $out/bin/pypy chmod +x $out/bin/pypy # TODO: compile python files? ''; |