@@ -34,7 +34,7 @@ in with passthru; stdenv.mkDerivation rec {
3434 inherit pname version;
3535
3636 src = fetchurl {
37− url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2";
37+ url = "https://bitbucket.org/pypy/pypy/downloads/pypy${pythonVersion}-v${version}-src.tar.bz2";
3838 inherit sha256;
3939 };
4040
@@ -75,13 +75,6 @@ in with passthru; stdenv.mkDerivation rec {
7575 postPatch = ''
7676 substituteInPlace "lib-python/${if isPy3k then "3/tkinter/tix.py" else "2.7/lib-tk/Tix.py"}" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
7777
78− # hint pypy to find nix ncurses
79− substituteInPlace pypy/module/_minimal_curses/fficurses.py \
80− --replace "/usr/include/ncurses/curses.h" "${ncurses.dev}/include/curses.h" \
81− --replace "ncurses/curses.h" "${ncurses.dev}/include/curses.h" \
82− --replace "ncurses/term.h" "${ncurses.dev}/include/term.h" \
83− --replace "libraries=['curses']" "libraries=['ncurses']"
84−
8578 sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite.dev}/include'], library_dirs=['${sqlite.out}/lib']@" lib_pypy/_sqlite3_build.py
8679 '';
8780
@@ -137,7 +130,7 @@ in with passthru; stdenv.mkDerivation rec {
137130 ln -s $out/${executable}-c/${executable}-c $out/bin/${executable}
138131
139132 # other packages expect to find stuff according to libPrefix
140− ln -s $out/${executable}/include $out/include/${libPrefix}
133+ ln -s $out/${executable}-c/include $out/include/${libPrefix}
141134 ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix}
142135
143136 ${stdenv.lib.optionalString stdenv.isDarwin ''