Merge pull request #230258 from ShadowRZ/shadowrz/fix-pygame-sdl2

pygame_sdl2 and renpy build fixes

authored by 7c6f434c and committed by GitHub 0ef7eafd 29f4bc52

+12 -4
+7 -4
pkgs/development/interpreters/renpy/default.nix
··· 3 3 , makeWrapper 4 4 }: 5 5 6 - stdenv.mkDerivation rec { 7 - pname = "renpy"; 8 - 6 + let 9 7 # https://renpy.org/doc/html/changelog.html#versioning 10 8 # base_version is of the form major.minor.patch 11 9 # vc_version is of the form YYMMDDCC 12 10 # version corresponds to the tag on GitHub 13 11 base_version = "8.0.3"; 14 12 vc_version = "22090809"; 13 + in stdenv.mkDerivation rec { 14 + pname = "renpy"; 15 + 15 16 version = "${base_version}.${vc_version}"; 16 17 17 18 src = fetchFromGitHub { ··· 46 47 47 48 postPatch = '' 48 49 substituteInPlace module/setup.py \ 49 - --replace "@fribidi@" "${fribidi}" 50 + --replace "@fribidi@" "${fribidi.dev}" 50 51 51 52 cp tutorial/game/tutorial_director.rpy{m,} 52 53 ··· 87 88 platforms = platforms.linux; 88 89 maintainers = with maintainers; [ shadowrz ]; 89 90 }; 91 + 92 + passthru = { inherit base_version vc_version; }; 90 93 }
+5
pkgs/development/python-modules/pygame_sdl2/default.nix
··· 17 17 rm -rf gen gen3 18 18 ''; 19 19 20 + # Remove build tag which produces invaild version 21 + postPatch = '' 22 + sed -i '2d' setup.cfg 23 + ''; 24 + 20 25 nativeBuildInputs = [ 21 26 SDL2.dev cython 22 27 ];