nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 06:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

summoning-pixel-dungeon: use default gradle

Browse Source 
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
    -> c8a6fdd57c

* "1.2.6: updated desktop build script for Gradle 7.0+"
    -> 5610142126

Additionally, allows this package to keep working after #352236
This commit is contained in:
Tomo 2024-10-30 04:29:39 +00:00
parent 4e9ddbc8d6
commit 6854e017bf
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix
View File

@ -1,6 +1,6 @@
{ callPackage { callPackage
, fetchFromGitHub , fetchFromGitHub
, gradle_6 , fetchpatch
, substitute , substitute
}: }:
@ -16,10 +16,26 @@ callPackage ../generic.nix rec {
hash = "sha256-VQcWkbGe/0qyt3M5WWgTxczwC5mE3lRHbYidOwRoukI="; hash = "sha256-VQcWkbGe/0qyt3M5WWgTxczwC5mE3lRHbYidOwRoukI=";
}; };
patches = [(substitute { patches = [
src = ./disable-git-version.patch; (substitute {
substitutions = [ "--subst-var-by" "version" version ]; 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"; desktopName = "Summoning Pixel Dungeon";
@ -28,7 +44,4 @@ callPackage ../generic.nix rec {
downloadPage = "https://github.com/TrashboxBobylev/Summoning-Pixel-Dungeon/releases"; downloadPage = "https://github.com/TrashboxBobylev/Summoning-Pixel-Dungeon/releases";
description = "A fork of the Shattered Pixel Dungeon roguelike with added summoning mechanics"; 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;
} }