diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-05-14 06:01:02 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-14 06:01:02 +0000 |
commit | c9632eb724214877eac1a3e90e58cb9c445f01f1 (patch) | |
tree | 153a84e6f465f50f6fa2a1bf9c233c74d8b4825e /pkgs/development/interpreters | |
parent | d0bd0aa98d419c59de94c7b6098ea1e15671a18b (diff) | |
parent | fc3229dbdf81cb13e6b89ab178fe35157171a3ed (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/renpy/default.nix | 93 | ||||
-rw-r--r-- | pkgs/development/interpreters/renpy/shutup-erofs-errors.patch | 29 |
2 files changed, 0 insertions, 122 deletions
diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix deleted file mode 100644 index 45a3630f7c576..0000000000000 --- a/pkgs/development/interpreters/renpy/default.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python3, pkg-config, SDL2 -, libpng, ffmpeg, freetype, glew, libGL, libGLU, fribidi, zlib -, makeWrapper -}: - -let - # https://renpy.org/doc/html/changelog.html#versioning - # 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.1.3"; - vc_version = "23091805"; -in stdenv.mkDerivation rec { - pname = "renpy"; - - version = "${base_version}.${vc_version}"; - - src = fetchFromGitHub { - owner = "renpy"; - repo = "renpy"; - rev = version; - sha256 = "sha256-bYqnKSWY8EEGr1+12cWeT9/ZSv5OrKLsRqCnnIruDQw="; - }; - - nativeBuildInputs = [ - pkg-config - makeWrapper - python3.pkgs.cython - python3.pkgs.setuptools - ]; - - buildInputs = [ - SDL2 libpng ffmpeg freetype glew libGLU libGL fribidi zlib - ] ++ (with python3.pkgs; [ - python pygame-sdl2 tkinter future six pefile requests ecdsa - ]); - - RENPY_DEPS_INSTALL = lib.concatStringsSep "::" (map (path: path) [ - SDL2 SDL2.dev libpng ffmpeg.lib freetype glew.dev libGLU libGL fribidi zlib - ]); - - enableParallelBuilding = true; - - patches = [ - ./shutup-erofs-errors.patch - ]; - - postPatch = '' - cp tutorial/game/tutorial_director.rpy{m,} - - cat > renpy/vc_version.py << EOF - version = '${version}' - official = False - nightly = False - # Look at https://renpy.org/latest.html for what to put. - version_name = 'Where No One Has Gone Before' - EOF - ''; - - buildPhase = with python3.pkgs; '' - runHook preBuild - ${python.pythonOnBuildForHost.interpreter} module/setup.py build --parallel=$NIX_BUILD_CORES - runHook postBuild - ''; - - installPhase = with python3.pkgs; '' - runHook preInstall - - ${python.pythonOnBuildForHost.interpreter} module/setup.py install_lib -d $out/${python.sitePackages} - mkdir -p $out/share/renpy - cp -vr sdk-fonts gui launcher renpy the_question tutorial renpy.py $out/share/renpy - - makeWrapper ${python.interpreter} $out/bin/renpy \ - --set PYTHONPATH "$PYTHONPATH:$out/${python.sitePackages}" \ - --add-flags "$out/share/renpy/renpy.py" - - runHook postInstall - ''; - - env.NIX_CFLAGS_COMPILE = with python3.pkgs; "-I${pygame-sdl2}/include/${python.libPrefix}"; - - meta = with lib; { - description = "Visual Novel Engine"; - mainProgram = "renpy"; - homepage = "https://renpy.org/"; - changelog = "https://renpy.org/doc/html/changelog.html"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ shadowrz ]; - }; - - passthru = { inherit base_version vc_version; }; -} diff --git a/pkgs/development/interpreters/renpy/shutup-erofs-errors.patch b/pkgs/development/interpreters/renpy/shutup-erofs-errors.patch deleted file mode 100644 index 9889c9f8ef858..0000000000000 --- a/pkgs/development/interpreters/renpy/shutup-erofs-errors.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 09e598ddf1f6af72ccb6c7c9301abff689e64f88 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: Wed, 17 May 2023 14:32:03 +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 de35457ba..b7d511560 100644 ---- a/renpy/script.py -+++ b/renpy/script.py -@@ -705,6 +705,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.40.1 - |