renpy: 8.0.0 -> 8.0.1

This commit is contained in:
夜坂雅 2022-08-13 19:53:48 +08:00
parent d686550401
commit a6ce9617eb
No known key found for this signature in database
GPG key ID: A24CE3ACA80FD3E4
3 changed files with 35 additions and 5 deletions

View file

@ -10,15 +10,15 @@ stdenv.mkDerivation rec {
# base_version is of the form major.minor.patch
# vc_version is of the form YYMMDDCC
# version corresponds to the tag on GitHub
base_version = "8.0.0";
vc_version = "22062402";
base_version = "8.0.1";
vc_version = "22070801";
version = "${base_version}.${vc_version}";
src = fetchFromGitHub {
owner = "renpy";
repo = "renpy";
rev = version;
sha256 = "sha256-37Hbs0i5eXMjVaETX7ImJCak0y8XtEHUaRFceA9J39A=";
sha256 = "sha256-rwRykovY8vv+boQiaSjCBoGxGpT1dF3qdEyxkykrKyk=";
};
nativeBuildInputs = [
@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
patches = [
./renpy-system-fribidi.diff
./shutup-erofs-errors.patch
];
postPatch = ''
@ -71,7 +72,7 @@ stdenv.mkDerivation rec {
makeWrapper ${python.interpreter} $out/bin/renpy \
--set PYTHONPATH "$PYTHONPATH:$out/${python.sitePackages}" \
--add-flags "-O $out/share/renpy/renpy.py"
--add-flags "$out/share/renpy/renpy.py"
runHook postInstall
'';

View file

@ -0,0 +1,29 @@
From 1660c8f20ac807fcd0ce65a8b9dc31e646a40711 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?=
<23130178+ShadowRZ@users.noreply.github.com>
Date: Sat, 13 Aug 2022 19:26:42 +0800
Subject: [PATCH] Don't print a backtrace on EROFS
This can shut up EROFS errors caused by writing to read-only /nix/store.
---
renpy/script.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/renpy/script.py b/renpy/script.py
index 3e5dae8..8f103c1 100644
--- a/renpy/script.py
+++ b/renpy/script.py
@@ -656,6 +656,10 @@ class Script(object):
rpydigest = hashlib.md5(fullf.read()).digest()
self.write_rpyc_md5(f, rpydigest)
+ except OSError as e:
+ if e.errno != 30:
+ import traceback
+ traceback.print_exc()
except Exception:
import traceback
traceback.print_exc()
--
2.37.1

View file

@ -9,7 +9,7 @@ buildPythonPackage rec {
src = fetchurl {
url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}-for-renpy-${renpy_version}.tar.gz";
sha256 = "sha256-iKsnmuSBzfHlIOHUwWECfvPa9LuBbCr9Kmq5dolxUlU=";
sha256 = "sha256-/PCw2sF3CxiBXV7WZcTl6NAs+v++od4Fs6uYFUhJMH8=";
};
# force rebuild of headers needed for install