fix(minecraft): Use newer java version

This commit is contained in:
Tristan Daniël Maat 2025-07-31 04:53:34 +08:00
parent e32c256369
commit b1f6caa28e
Signed by: tlater
GPG key ID: 49670FD774E43268

View file

@ -4,6 +4,9 @@
config, config,
... ...
}: }:
let
java = pkgs.jdk21_headless;
in
{ {
services.minecraft-server = { services.minecraft-server = {
enable = true; enable = true;
@ -39,7 +42,7 @@
package = pkgs.writeShellApplication { package = pkgs.writeShellApplication {
name = "minecraft-server"; name = "minecraft-server";
runtimeInputs = with pkgs; [ jdk17_headless ]; runtimeInputs = [ java ];
text = '' text = ''
exec /var/lib/minecraft/run.sh $@ exec /var/lib/minecraft/run.sh $@
@ -48,7 +51,7 @@
}; };
systemd.services.minecraft-server = { systemd.services.minecraft-server = {
path = with pkgs; [ jdk17_headless ]; path = [ java ];
# Since we read from our own HTTP server, we need to wait for it # Since we read from our own HTTP server, we need to wait for it
# to be up # to be up
@ -60,7 +63,7 @@
serviceConfig = { serviceConfig = {
# Use packwiz to install mods # Use packwiz to install mods
ExecStartPre = [ ExecStartPre = [
"${pkgs.jdk17_headless}/bin/java -jar ${config.services.minecraft-server.dataDir}/packwiz-installer-bootstrap.jar -g -s server 'https://minecraft.${config.services.nginx.domain}/cobblemon-pack/pack.toml'" "${java}/bin/java -jar ${config.services.minecraft-server.dataDir}/packwiz-installer-bootstrap.jar -g -s server 'https://minecraft.${config.services.nginx.domain}/cobblemon-pack/pack.toml'"
]; ];
# Forge requires some bonus JVM options, which they include in a # Forge requires some bonus JVM options, which they include in a
# little `run.sh` script # little `run.sh` script