renpy: 6.17.6 -> 6.99.12.4; still a strange mistake on launch

This commit is contained in:
Michael Raskin 2017-03-17 14:14:08 +01:00
parent b4fd04c395
commit 8388cb8bff

View File

@ -1,11 +1,12 @@
{ stdenv, fetchurl, pythonPackages, pkgconfig, SDL { stdenv, fetchurl, pythonPackages, pkgconfig, SDL2
, libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib , libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib
, glib
}: }:
with pythonPackages; with pythonPackages;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "renpy-6.17.6"; name = "renpy-6.99.12.4";
meta = { meta = {
description = "Ren'Py Visual Novel Engine"; description = "Ren'Py Visual Novel Engine";
@ -18,19 +19,19 @@ stdenv.mkDerivation {
}; };
src = fetchurl { src = fetchurl {
url = "http://www.renpy.org/dl/6.17.6/renpy-6.17.6-source.tar.bz2"; url = "http://www.renpy.org/dl/6.99.12.4/renpy-6.99.12.4-source.tar.bz2";
sha256 = "0rkynw9cnr1zqdinz037d9zig6grhp2ca2pyxk80vhdpjb0xrkic"; sha256 = "035342rr39zp7krp08z0xhcl73gqbqyilshgmljq0ynfrxxckn35";
}; };
buildInputs = [ buildInputs = [
python cython pkgconfig wrapPython python cython pkgconfig wrapPython
SDL libpng ffmpeg freetype glew mesa fribidi zlib pygame SDL2 libpng ffmpeg freetype glew mesa fribidi zlib pygame_sdl2 glib
]; ];
pythonPath = [ pygame ]; pythonPath = [ pygame_sdl2 ];
RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: "${path}") [ RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: "${path}") [
SDL SDL.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out mesa fribidi zlib SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out mesa fribidi zlib
]); ]);
buildPhase = '' buildPhase = ''
@ -42,12 +43,11 @@ stdenv.mkDerivation {
cp -r renpy renpy.py $out/share/renpy cp -r renpy renpy.py $out/share/renpy
python module/setup.py install --prefix=$out --install-lib=$out/share/renpy/module python module/setup.py install --prefix=$out --install-lib=$out/share/renpy/module
wrapPythonPrograms
makeWrapper ${python}/bin/python $out/bin/renpy \ makeWrapper ${python}/bin/python $out/bin/renpy \
--set PYTHONPATH $program_PYTHONPATH \ --set PYTHONPATH $PYTHONPATH \
--set RENPY_BASE $out/share/renpy \ --set RENPY_BASE $out/share/renpy \
--add-flags "-O $out/share/renpy/renpy.py" --add-flags "-O $out/share/renpy/renpy.py"
''; '';
NIX_CFLAGS_COMPILE = "-I${pygame}/include/${python.libPrefix}"; NIX_CFLAGS_COMPILE = "-I${pygame_sdl2}/include/${python.libPrefix}";
} }