From 56ce09c86c9dee92aedfa73febcfe47fc3171223 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Mon, 5 May 2025 21:57:29 +0200 Subject: [PATCH 1/2] Revert "renpy: drop `RENPY_DEPS_INSTALL`" This reverts commit d151e48c63c36ee9b4ec5eb3d07e1cda9cae9b55. The commit dropping `RENPY_DEPS_INSTALL` support [1] is present only on the master branch which is not yet released. [1]:https://github.com/renpy/renpy/commit/f2d3e0d20e2e4267bf9ff0bd0d482f1fd4a5a2fc --- pkgs/by-name/re/renpy/package.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/by-name/re/renpy/package.nix b/pkgs/by-name/re/renpy/package.nix index bdc76102fdc4..dc72a086f7e0 100644 --- a/pkgs/by-name/re/renpy/package.nix +++ b/pkgs/by-name/re/renpy/package.nix @@ -65,6 +65,20 @@ stdenv.mkDerivation (finalAttrs: { tkinter ]); + RENPY_DEPS_INSTALL = lib.concatStringsSep "::" [ + ffmpeg.lib + freetype + fribidi + glew.dev + harfbuzz.dev + libGL + libGLU + libpng + SDL2 + (lib.getDev SDL2) + zlib + ]; + enableParallelBuilding = true; patches = [ From c769907a4ede01a1006c63f9360f02ca3a909f3f Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Mon, 5 May 2025 22:41:16 +0200 Subject: [PATCH 2/2] renpy: don't use deprecated stubs on Darwin --- pkgs/by-name/re/renpy/package.nix | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/re/renpy/package.nix b/pkgs/by-name/re/renpy/package.nix index dc72a086f7e0..51ef113f9f03 100644 --- a/pkgs/by-name/re/renpy/package.nix +++ b/pkgs/by-name/re/renpy/package.nix @@ -65,19 +65,23 @@ stdenv.mkDerivation (finalAttrs: { tkinter ]); - RENPY_DEPS_INSTALL = lib.concatStringsSep "::" [ - ffmpeg.lib - freetype - fribidi - glew.dev - harfbuzz.dev - libGL - libGLU - libpng - SDL2 - (lib.getDev SDL2) - zlib - ]; + RENPY_DEPS_INSTALL = lib.concatStringsSep "::" ( + [ + ffmpeg.lib + freetype + fribidi + glew.dev + harfbuzz.dev + libpng + SDL2 + (lib.getDev SDL2) + zlib + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + libGL + libGLU + ] + ); enableParallelBuilding = true;