pyrox.dev / nixpkgs
lol
fork atom

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