renpy: reformat with nixfmt-rfc-style and migrate to by-name

This commit is contained in:
Leah Amelia Chen
2024-05-13 21:46:20 +02:00
parent 20b8d480ee
commit b881e25eb6
3 changed files with 61 additions and 20 deletions

View File

@@ -1,6 +1,20 @@
{ lib, stdenv, fetchFromGitHub, python3, pkg-config, SDL2 {
, libpng, ffmpeg, freetype, glew, libGL, libGLU, fribidi, zlib, harfbuzz lib,
, makeWrapper stdenv,
fetchFromGitHub,
python3,
pkg-config,
SDL2,
libpng,
ffmpeg,
freetype,
glew,
libGL,
libGLU,
fribidi,
zlib,
harfbuzz,
makeWrapper,
}: }:
let let
@@ -11,7 +25,8 @@ let
base_version = "8.2.1"; base_version = "8.2.1";
vc_version = "24030407"; vc_version = "24030407";
version = "${base_version}.${vc_version}"; version = "${base_version}.${vc_version}";
in stdenv.mkDerivation { in
stdenv.mkDerivation {
pname = "renpy"; pname = "renpy";
inherit version; inherit version;
@@ -31,21 +46,47 @@ in stdenv.mkDerivation {
python3.pkgs.setuptools python3.pkgs.setuptools
]; ];
buildInputs = [ buildInputs =
SDL2 libpng ffmpeg freetype glew libGLU libGL fribidi zlib harfbuzz [
] ++ (with python3.pkgs; [ SDL2
python pygame-sdl2 tkinter future six pefile requests ecdsa 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 "::" [ RENPY_DEPS_INSTALL = lib.concatStringsSep "::" [
SDL2 SDL2.dev libpng ffmpeg.lib freetype glew.dev libGLU libGL fribidi zlib harfbuzz.dev SDL2
SDL2.dev
libpng
ffmpeg.lib
freetype
glew.dev
libGLU
libGL
fribidi
zlib
harfbuzz.dev
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
patches = [ patches = [ ./shutup-erofs-errors.patch ];
./shutup-erofs-errors.patch
];
postPatch = '' postPatch = ''
cp tutorial/game/tutorial_director.rpy{m,} cp tutorial/game/tutorial_director.rpy{m,}
@@ -81,15 +122,17 @@ in stdenv.mkDerivation {
env.NIX_CFLAGS_COMPILE = with python3.pkgs; "-I${pygame-sdl2}/include/${python.libPrefix}"; env.NIX_CFLAGS_COMPILE = with python3.pkgs; "-I${pygame-sdl2}/include/${python.libPrefix}";
meta = with lib; { meta = {
description = "Visual Novel Engine"; description = "Visual Novel Engine";
mainProgram = "renpy"; mainProgram = "renpy";
homepage = "https://renpy.org/"; homepage = "https://renpy.org/";
changelog = "https://renpy.org/doc/html/changelog.html"; changelog = "https://renpy.org/doc/html/changelog.html";
license = licenses.mit; license = lib.licenses.mit;
platforms = platforms.linux; platforms = lib.platforms.linux;
maintainers = with maintainers; [ shadowrz ]; maintainers = with lib.maintainers; [ shadowrz ];
}; };
passthru = { inherit base_version vc_version; }; passthru = {
inherit base_version vc_version;
};
} }

View File

@@ -12393,8 +12393,6 @@ with pkgs;
redsocks = callPackage ../tools/networking/redsocks { }; redsocks = callPackage ../tools/networking/redsocks { };
renpy = callPackage ../development/interpreters/renpy { };
rep = callPackage ../development/tools/rep { }; rep = callPackage ../development/tools/rep { };
repseek = callPackage ../applications/science/biology/repseek { }; repseek = callPackage ../applications/science/biology/repseek { };