Skip to content

Commit

Permalink
summoning-pixel-dungeon: use default gradle
Browse files Browse the repository at this point in the history
Upstream has made it possible to use a recent version of Gradle,
thanks to some patches:
* "1.2.6: changed JVM args to be compatible with Java 17"
    -> This is not directly applied, as it fails to apply cleanly; we use substituteInPlace instead
    -> TrashboxBobylev/Summoning-Pixel-Dungeon@c8a6fdd

* "1.2.6: updated desktop build script for Gradle 7.0+"
    -> TrashboxBobylev/Summoning-Pixel-Dungeon@5610142

Additionally, allows this package to keep working after NixOS#352236
  • Loading branch information
tomodachi94 authored and jmartindf committed Nov 1, 2024
1 parent 9ae5da0 commit 11dcf76
Showing 1 changed file with 21 additions and 8 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ callPackage
, fetchFromGitHub
, gradle_6
, fetchpatch
, substitute
}:

Expand All @@ -16,10 +16,26 @@ callPackage ../generic.nix rec {
hash = "sha256-VQcWkbGe/0qyt3M5WWgTxczwC5mE3lRHbYidOwRoukI=";
};

patches = [(substitute {
src = ./disable-git-version.patch;
substitutions = [ "--subst-var-by" "version" version ];
})];
patches = [
(substitute {
src = ./disable-git-version.patch;
substitutions = [ "--subst-var-by" "version" version ];
})
# FIXME: Remove after next release
(fetchpatch {
name = "Update-desktop-build-script-for-Gradle-7.0+";
url = "https://github.com/TrashboxBobylev/Summoning-Pixel-Dungeon/commit/5610142126e161cbdc78a07c5d5abfbcd6eaf8a6.patch";
hash = "sha256-zAiOz/Cu89Y+VmAyLCf7fzq0Mr0sYFZu14sqBZ/XvZU=";
})
];

postPatch = ''
# Upstream patched this in https://github.com/TrashboxBobylev/Summoning-Pixel-Dungeon/commit/c8a6fdd57c49fd91bf65be48679ae6a77578ef9f,
# but the patch fails to apply cleanly. Manually replace the deprecated option instead.
# FIXME: Remove after next release
substituteInPlace gradle.properties \
--replace-fail "-XX:MaxPermSize" "-XX:MaxMetaspaceSize"
'';

desktopName = "Summoning Pixel Dungeon";

Expand All @@ -28,7 +44,4 @@ callPackage ../generic.nix rec {
downloadPage = "https://github.com/TrashboxBobylev/Summoning-Pixel-Dungeon/releases";
description = "A fork of the Shattered Pixel Dungeon roguelike with added summoning mechanics";
};

# Probably due to https://github.com/gradle/gradle/issues/17236
gradle = gradle_6;
}

0 comments on commit 11dcf76

Please sign in to comment.