summoning-pixel-dungeon: use default gradle (#352275)

authored by Emily and committed by GitHub bc685706 220bfa96

+21 -8
+21 -8
pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix
··· 1 { callPackage 2 , fetchFromGitHub 3 - , gradle_6 4 , substitute 5 }: 6 ··· 16 hash = "sha256-VQcWkbGe/0qyt3M5WWgTxczwC5mE3lRHbYidOwRoukI="; 17 }; 18 19 - patches = [(substitute { 20 - src = ./disable-git-version.patch; 21 - substitutions = [ "--subst-var-by" "version" version ]; 22 - })]; 23 24 desktopName = "Summoning Pixel Dungeon"; 25 ··· 28 downloadPage = "https://github.com/TrashboxBobylev/Summoning-Pixel-Dungeon/releases"; 29 description = "A fork of the Shattered Pixel Dungeon roguelike with added summoning mechanics"; 30 }; 31 - 32 - # Probably due to https://github.com/gradle/gradle/issues/17236 33 - gradle = gradle_6; 34 }
··· 1 { callPackage 2 , fetchFromGitHub 3 + , fetchpatch 4 , substitute 5 }: 6 ··· 16 hash = "sha256-VQcWkbGe/0qyt3M5WWgTxczwC5mE3lRHbYidOwRoukI="; 17 }; 18 19 + patches = [ 20 + (substitute { 21 + src = ./disable-git-version.patch; 22 + substitutions = [ "--subst-var-by" "version" version ]; 23 + }) 24 + # FIXME: Remove after next release 25 + (fetchpatch { 26 + name = "Update-desktop-build-script-for-Gradle-7.0+"; 27 + url = "https://github.com/TrashboxBobylev/Summoning-Pixel-Dungeon/commit/5610142126e161cbdc78a07c5d5abfbcd6eaf8a6.patch"; 28 + hash = "sha256-zAiOz/Cu89Y+VmAyLCf7fzq0Mr0sYFZu14sqBZ/XvZU="; 29 + }) 30 + ]; 31 + 32 + postPatch = '' 33 + # Upstream patched this in https://github.com/TrashboxBobylev/Summoning-Pixel-Dungeon/commit/c8a6fdd57c49fd91bf65be48679ae6a77578ef9f, 34 + # but the patch fails to apply cleanly. Manually replace the deprecated option instead. 35 + # FIXME: Remove after next release 36 + substituteInPlace gradle.properties \ 37 + --replace-fail "-XX:MaxPermSize" "-XX:MaxMetaspaceSize" 38 + ''; 39 40 desktopName = "Summoning Pixel Dungeon"; 41 ··· 44 downloadPage = "https://github.com/TrashboxBobylev/Summoning-Pixel-Dungeon/releases"; 45 description = "A fork of the Shattered Pixel Dungeon roguelike with added summoning mechanics"; 46 }; 47 }