tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
0
fork
atom
lol
0
fork
atom
overview
issues
pulls
pipelines
renpy: 8.1.0 -> 8.1.1
夜坂雅
2 years ago
396095b8
ead1dc99
+7
-56
3 changed files
expand all
collapse all
unified
split
pkgs
development
interpreters
renpy
default.nix
renpy-system-fribidi.diff
python-modules
pygame_sdl2
default.nix
+6
-4
pkgs/development/interpreters/renpy/default.nix
reviewed
···
8
8
# base_version is of the form major.minor.patch
9
9
# vc_version is of the form YYMMDDCC
10
10
# version corresponds to the tag on GitHub
11
11
-
base_version = "8.1.0";
12
12
-
vc_version = "23051307";
11
11
+
base_version = "8.1.1";
12
12
+
vc_version = "23060707";
13
13
in stdenv.mkDerivation rec {
14
14
pname = "renpy";
15
15
···
19
19
owner = "renpy";
20
20
repo = "renpy";
21
21
rev = version;
22
22
-
sha256 = "sha256-5EU4jaBTU+a9UNHRs7xrKQ7ZivhDEqisO3l4W2E6F+c=";
22
22
+
sha256 = "sha256-aJ/MobZ6SNBYRC/EpUxAMLJ3pwK6PC92DV0YL/LF5Ew=";
23
23
};
24
24
25
25
nativeBuildInputs = [
···
49
49
cp tutorial/game/tutorial_director.rpy{m,}
50
50
51
51
cat > renpy/vc_version.py << EOF
52
52
-
vc_version = ${vc_version}
52
52
+
version = '${version}'
53
53
official = False
54
54
nightly = False
55
55
+
# Look at https://renpy.org/latest.html for what to put.
56
56
+
version_name = 'Where No One Has Gone Before'
55
57
EOF
56
58
'';
57
59
-51
pkgs/development/interpreters/renpy/renpy-system-fribidi.diff
reviewed
···
1
1
-
diff --git a/module/renpybidicore.c b/module/renpybidicore.c
2
2
-
index 849430d..d883a52 100644
3
3
-
--- a/module/renpybidicore.c
4
4
-
+++ b/module/renpybidicore.c
5
5
-
@@ -1,10 +1,6 @@
6
6
-
#include <Python.h>
7
7
-
8
8
-
-#ifdef RENPY_BUILD
9
9
-
#include <fribidi.h>
10
10
-
-#else
11
11
-
-#include <fribidi-src/lib/fribidi.h>
12
12
-
-#endif
13
13
-
14
14
-
#include <stdlib.h>
15
15
-
16
16
-
diff --git a/module/setup.py b/module/setup.py
17
17
-
index bd16816..f6b8794 100755
18
18
-
--- a/module/setup.py
19
19
-
+++ b/module/setup.py
20
20
-
@@ -118,29 +118,17 @@ cython(
21
21
-
sdl + [ png, 'z', 'm' ])
22
22
-
23
23
-
FRIBIDI_SOURCES = """
24
24
-
-fribidi-src/lib/fribidi.c
25
25
-
-fribidi-src/lib/fribidi-arabic.c
26
26
-
-fribidi-src/lib/fribidi-bidi.c
27
27
-
-fribidi-src/lib/fribidi-bidi-types.c
28
28
-
-fribidi-src/lib/fribidi-deprecated.c
29
29
-
-fribidi-src/lib/fribidi-joining.c
30
30
-
-fribidi-src/lib/fribidi-joining-types.c
31
31
-
-fribidi-src/lib/fribidi-mem.c
32
32
-
-fribidi-src/lib/fribidi-mirroring.c
33
33
-
-fribidi-src/lib/fribidi-run.c
34
34
-
-fribidi-src/lib/fribidi-shape.c
35
35
-
renpybidicore.c
36
36
-
""".split()
37
37
-
cython(
38
38
-
"_renpybidi",
39
39
-
FRIBIDI_SOURCES,
40
40
-
+ ["fribidi"],
41
41
-
includes=[
42
42
-
- BASE + "/fribidi-src/",
43
43
-
- BASE + "/fribidi-src/lib/",
44
44
-
+ "@fribidi@/include/fribidi/",
45
45
-
],
46
46
-
define_macros=[
47
47
-
("FRIBIDI_ENTRY", ""),
48
48
-
- ("HAVE_CONFIG_H", "1"),
49
49
-
])
50
50
-
51
51
-
if not (android or ios or emscripten):
+1
-1
pkgs/development/python-modules/pygame_sdl2/default.nix
reviewed
···
9
9
10
10
src = fetchurl {
11
11
url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}-for-renpy-${renpy_version}.tar.gz";
12
12
-
hash = "sha256-smJsOVavMvy0aO3C5PC050LlOy5bsG45uWSMbbFMQ+I=";
12
12
+
hash = "sha256-u9DIFKd+uyphH3ETMJWYqt7YFyeIgBWoXUO3rC+RWjc=";
13
13
};
14
14
15
15
# force rebuild of headers needed for install