Skip to content

maptool: 1.17.1 -> 1.18.5 #427966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wolfgangwalther merged 2 commits into from
Sep 21, 2025
Merged

maptool: 1.17.1 -> 1.18.5 #427966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c20d614
maptool: 1.17.1 -> 1.18.5
r-ryantm Sep 20, 2025
8393284
maptool: remove dependency pins and move to by-name
rhendric Sep 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkgs/games/maptool/default.nix → pkgs/by-name/ma/maptool/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
}:
let
pname = "maptool";
version = "1.17.1";
version = "1.18.5";
repoBase = "https://github.com/RPTools/maptool";
src = fetchurl {
url = "${repoBase}/releases/download/${version}/maptool-${version}-x86_64.pkg.tar.zst";
hash = "sha256-yPuZUPRP0O+5Grj53xteZovowuFxOo4q6qL3mnjgIu0=";
hash = "sha256-67szWKgx3B5HacpzYThxGDHKHK5qz2GQ15+ZEuEGlAU=";
};

meta = with lib; {
Expand Down Expand Up @@ -124,7 +124,7 @@ stdenvNoCC.mkDerivation {

dest=$out/bin
install -dm755 "$dest"
makeWrapper ${jre}/bin/java "$dest"/${binName} \
makeWrapper ${lib.getExe jre} "$dest"/${binName} \
"''${gappsWrapperArgs[@]}" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ ffmpeg ]} \
--add-flags "${lib.concatStringsSep " " jvmArgs} net.rptools.maptool.client.LaunchInstructions"
Expand Down
8 changes: 0 additions & 8 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13862,14 +13862,6 @@ with pkgs;

liquidwar5 = callPackage ../games/liquidwar/5.nix { };

maptool = callPackage ../games/maptool {
# MapTool is fussy about which JRE it uses; OpenJDK will leave it hanging
# at launch in a class initialization deadlock. MapTool ships Temurin with
# their pre-built releases so we might as well use it too.
jre = temurin-bin-21;
openjfx = openjfx21;
};

mindustry-wayland = callPackage ../by-name/mi/mindustry/package.nix {
enableWayland = true;
};
Expand Down
Loading