renpy: 8.2.1 -> 8.3.1 (#343874)
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
python311,
|
||||
pkg-config,
|
||||
SDL2,
|
||||
libpng,
|
||||
@@ -22,8 +22,8 @@ let
|
||||
# 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.2.1";
|
||||
vc_version = "24030407";
|
||||
base_version = "8.3.1";
|
||||
vc_version = "24090601";
|
||||
version = "${base_version}.${vc_version}";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
|
||||
owner = "renpy";
|
||||
repo = "renpy";
|
||||
rev = version;
|
||||
hash = "sha256-07Hj8mJGR0+Pn1DQ+sK5YQ3x3CTMsZ5h5yEoz44b2TM=";
|
||||
hash = "sha256-k8mcDzaFngRF3Xl9cinUFU0T9sjxNIVrECUguARJVZ4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -42,8 +42,8 @@ stdenv.mkDerivation {
|
||||
makeWrapper
|
||||
# Ren'Py currently does not compile on Cython 3.x.
|
||||
# See https://github.com/renpy/renpy/issues/5359
|
||||
python3.pkgs.cython_0
|
||||
python3.pkgs.setuptools
|
||||
python311.pkgs.cython_0
|
||||
python311.pkgs.setuptools
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
@@ -59,7 +59,7 @@ stdenv.mkDerivation {
|
||||
zlib
|
||||
harfbuzz
|
||||
]
|
||||
++ (with python3.pkgs; [
|
||||
++ (with python311.pkgs; [
|
||||
python
|
||||
pygame-sdl2
|
||||
tkinter
|
||||
@@ -100,13 +100,13 @@ stdenv.mkDerivation {
|
||||
EOF
|
||||
'';
|
||||
|
||||
buildPhase = with python3.pkgs; ''
|
||||
buildPhase = with python311.pkgs; ''
|
||||
runHook preBuild
|
||||
${python.pythonOnBuildForHost.interpreter} module/setup.py build --parallel=$NIX_BUILD_CORES
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = with python3.pkgs; ''
|
||||
installPhase = with python311.pkgs; ''
|
||||
runHook preInstall
|
||||
|
||||
${python.pythonOnBuildForHost.interpreter} module/setup.py install_lib -d $out/${python.sitePackages}
|
||||
@@ -120,7 +120,7 @@ stdenv.mkDerivation {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = with python3.pkgs; "-I${pygame-sdl2}/include/${python.libPrefix}";
|
||||
env.NIX_CFLAGS_COMPILE = with python311.pkgs; "-I${pygame-sdl2}/include/${python.libPrefix}";
|
||||
|
||||
meta = {
|
||||
description = "Visual Novel Engine";
|
||||
|
||||
@@ -26,7 +26,7 @@ buildPythonPackage {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}+renpy${renpy_version}.tar.gz";
|
||||
hash = "sha256-Zib39NyQ1pGVCWPrK5/Tl3dAylUlmKZKxU8pf+OpAdY=";
|
||||
hash = "sha256-bcTrdXWLTCnZQ/fP5crKIPoqJiyz+o6s0PzRChV7TQE=";
|
||||
};
|
||||
|
||||
# force rebuild of headers needed for install
|
||||
|
||||
Reference in New Issue
Block a user