Commit 20b8d480 authored by Leah Amelia Chen's avatar Leah Amelia Chen
Browse files

renpy: 8.1.3 -> 8.2.1 

Also switched to `pyproject = true;` for `pythonPackages.pygame-sdl2`,
and added a dependency on Harfbuzz for Ren'Py
parent 8ef2c4f9

pkgs/development/interpreters/renpy/default.nix

+12 −12
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, python3, pkg-config, SDL2

, libpng, ffmpeg, freetype, glew, libGL, libGLU, fribidi, zlib

, libpng, ffmpeg, freetype, glew, libGL, libGLU, fribidi, zlib, harfbuzz

, makeWrapper

}:
@@ -8,18 +8,18 @@ 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.1.3";

  vc_version = "23091805";

in stdenv.mkDerivation rec {

  pname = "renpy";



  base_version = "8.2.1";

  vc_version = "24030407";

  version = "${base_version}.${vc_version}";

in stdenv.mkDerivation {

  pname = "renpy";

  inherit version;



  src = fetchFromGitHub {

    owner = "renpy";

    repo = "renpy";

    rev = version;

    sha256 = "sha256-bYqnKSWY8EEGr1+12cWeT9/ZSv5OrKLsRqCnnIruDQw=";

    hash = "sha256-07Hj8mJGR0+Pn1DQ+sK5YQ3x3CTMsZ5h5yEoz44b2TM=";

  };



  nativeBuildInputs = [
@@ -32,14 +32,14 @@ in stdenv.mkDerivation rec { 
  ];



  buildInputs = [

    SDL2 libpng ffmpeg freetype glew libGLU libGL fribidi zlib

    SDL2 libpng ffmpeg freetype glew libGLU libGL fribidi zlib harfbuzz

  ] ++ (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

  ]);

  RENPY_DEPS_INSTALL = lib.concatStringsSep "::" [

    SDL2 SDL2.dev libpng ffmpeg.lib freetype glew.dev libGLU libGL fribidi zlib harfbuzz.dev

  ];



  enableParallelBuilding = true;
@@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { 
    official = False

    nightly = False

    # Look at https://renpy.org/latest.html for what to put.

    version_name = 'Where No One Has Gone Before'

    version_name = '64bit Sensation'

    EOF

  '';

pkgs/development/python-modules/pygame-sdl2/default.nix

+4 −4
Original line number Diff line number Diff line 
{ lib, buildPythonPackage, fetchurl, isPy27, renpy

, cython_0, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }:

, cython_0, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng, setuptools }:



buildPythonPackage rec {

  pname = "pygame-sdl2";

  version = "2.1.0";

  format = "setuptools";

  pyproject = true;

  renpy_version = renpy.base_version;

  name = "${pname}-${version}-${renpy_version}";



  src = fetchurl {

    url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}+renpy${renpy_version}.tar.gz";

    hash = "sha256-mrfrsRAVEqw7fwtYdeATp/8AtMn74x9pJEXwYZPOl2I=";

    hash = "sha256-Zib39NyQ1pGVCWPrK5/Tl3dAylUlmKZKxU8pf+OpAdY=";

  };



  # force rebuild of headers needed for install
@@ -24,7 +24,7 @@ buildPythonPackage rec { 
  '';



  nativeBuildInputs = [

    SDL2.dev cython_0

    SDL2.dev cython_0 setuptools

  ];



  buildInputs = [