pyrox.dev
Renpy and pygame_sdl2 update - 6.99.14 (#33943)
* pygame_sdl2: 6.99.10.1227 -> 2.1.0-6.99.14
* renpy: 6.99.12.4 -> 6.99.14
authored by rardiol and committed by Matthew Justin Bauer f83cbf20 e5a854e7
+21
-13
pkgs/development/interpreters/renpy/default.nix
+21
-13
pkgs/development/interpreters/renpy/default.nix
···
5
6
with pythonPackages;
7
8
-
stdenv.mkDerivation {
9
-
name = "renpy-6.99.12.4";
10
11
-
meta = {
12
description = "Ren'Py Visual Novel Engine";
13
homepage = http://renpy.org/;
14
-
license = stdenv.lib.licenses.mit;
15
-
platforms = stdenv.lib.platforms.linux;
16
-
# This is an ancient version, last updated in 2014 (3d59f42ce); it fails to
17
-
# build with the most recent pygame version, and fails to run with 1.9.1.
18
-
broken = true;
19
};
20
21
src = fetchurl {
22
-
url = "http://www.renpy.org/dl/6.99.12.4/renpy-6.99.12.4-source.tar.bz2";
23
-
sha256 = "035342rr39zp7krp08z0xhcl73gqbqyilshgmljq0ynfrxxckn35";
24
};
25
26
nativeBuildInputs = [ pkgconfig ];
27
buildInputs = [
28
-
python cython wrapPython
29
SDL2 libpng ffmpeg freetype glew libGLU_combined fribidi zlib pygame_sdl2 glib
30
];
31
32
-
pythonPath = [ pygame_sdl2 ];
33
34
RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: "${path}") [
35
SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out libGLU_combined fribidi zlib
···
41
42
installPhase = ''
43
mkdir -p $out/share/renpy
44
-
cp -r renpy renpy.py $out/share/renpy
45
python module/setup.py install --prefix=$out --install-lib=$out/share/renpy/module
46
47
makeWrapper ${python}/bin/python $out/bin/renpy \
···
5
6
with pythonPackages;
7
8
+
stdenv.mkDerivation rec {
9
+
name = "renpy-${version}";
10
+
version = "6.99.14";
11
12
+
meta = with stdenv.lib; {
13
description = "Ren'Py Visual Novel Engine";
14
homepage = http://renpy.org/;
15
+
license = licenses.mit;
16
+
platforms = platforms.linux;
17
};
18
19
src = fetchurl {
20
+
url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2";
21
+
sha256 = "00r1l9rd9wj8zfh279n7sak894xxhxqp3rcwg41g0md8yfiysc4h";
22
};
23
+
24
+
patches = [
25
+
./launcherenv.patch
26
+
];
27
+
28
+
postPatch = ''
29
+
substituteInPlace launcher/game/choose_directory.rpy --replace /usr/bin/python ${python.interpreter}
30
+
'';
31
32
nativeBuildInputs = [ pkgconfig ];
33
buildInputs = [
34
+
python cython wrapPython tkinter
35
SDL2 libpng ffmpeg freetype glew libGLU_combined fribidi zlib pygame_sdl2 glib
36
];
37
38
+
pythonPath = [ pygame_sdl2 tkinter ];
39
40
RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: "${path}") [
41
SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out libGLU_combined fribidi zlib
···
47
48
installPhase = ''
49
mkdir -p $out/share/renpy
50
+
cp -vr * $out/share/renpy
51
+
rm -rf $out/share/renpy/module
52
+
53
python module/setup.py install --prefix=$out --install-lib=$out/share/renpy/module
54
55
makeWrapper ${python}/bin/python $out/bin/renpy \
+14
pkgs/development/interpreters/renpy/launcherenv.patch
+14
pkgs/development/interpreters/renpy/launcherenv.patch
···
···
1
+
# The launcher game starts projects in a separate python process
2
+
# with the -E flag, which prevents the nix set PYTHONPATH envvar
3
+
# from taking effect, preventing the loading of pygame_sdl2
4
+
--- a/launcher/game/project.rpy
5
+
+++ b/launcher/game/project.rpy
6
+
@@ -239,7 +239,7 @@
7
+
raise Exception("Python interpreter not found: %r", executables)
8
+
9
+
# Put together the basic command line.
10
+
- cmd = [ executable, "-EO", sys.argv[0] ]
11
+
+ cmd = [ executable, "-O", sys.argv[0] ]
12
+
13
+
cmd.append(self.path)
14
+
cmd.extend(args)
+20
-8
pkgs/development/python-modules/pygame_sdl2/default.nix
+20
-8
pkgs/development/python-modules/pygame_sdl2/default.nix
···
1
-
{ stdenv, pkgs, buildPythonPackage, fetchFromGitHub, isPy27
2
, cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }:
3
4
buildPythonPackage rec {
5
pname = "pygame_sdl2";
6
-
version = "6.99.10.1227";
7
-
name = "${pname}-${version}";
8
9
-
src = fetchFromGitHub {
10
-
owner = "renpy";
11
-
repo = "${pname}";
12
-
rev = "renpy-${version}";
13
-
sha256 = "10n6janvqh5adn7pcijqwqfh234sybjz788kb8ac6b4l11hy2lx1";
14
};
15
16
buildInputs = [
17
SDL2 SDL2_image SDL2_ttf SDL2_mixer
···
1
+
{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy27, fetchpatch
2
, cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }:
3
4
buildPythonPackage rec {
5
pname = "pygame_sdl2";
6
+
version = "2.1.0";
7
+
renpy_version = "6.99.14";
8
+
name = "${pname}-${version}-${renpy_version}";
9
10
+
src = fetchurl {
11
+
url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}-for-renpy-${renpy_version}.tar.gz";
12
+
sha256 = "1zsnb2bivbwysgxmfg9iv12arhpf3gqkmqinhciz955hlqv016b9";
13
};
14
+
15
+
# force rebuild of headers needed for install
16
+
prePatch = ''
17
+
rm -rf gen gen3
18
+
'';
19
+
20
+
patches = [
21
+
# fix for recent sdl2
22
+
(fetchpatch {
23
+
url = "https://github.com/apoleon/pygame_sdl2/commit/ced6051f4a4559a725804cc58c079e1efea0a573.patch";
24
+
sha256 = "08rqjzvdlmmdf8kyd8ws5lzjy1mrwnds4fdy38inkyw7saydcxyr";
25
+
})
26
+
];
27
28
buildInputs = [
29
SDL2 SDL2_image SDL2_ttf SDL2_mixer