fix(minecraft): Use newer java version
This commit is contained in:
parent
e32c256369
commit
b1f6caa28e
1 changed files with 6 additions and 3 deletions
|
@ -4,6 +4,9 @@
|
|||
config,
|
||||
...
|
||||
}:
|
||||
let
|
||||
java = pkgs.jdk21_headless;
|
||||
in
|
||||
{
|
||||
services.minecraft-server = {
|
||||
enable = true;
|
||||
|
@ -39,7 +42,7 @@
|
|||
|
||||
package = pkgs.writeShellApplication {
|
||||
name = "minecraft-server";
|
||||
runtimeInputs = with pkgs; [ jdk17_headless ];
|
||||
runtimeInputs = [ java ];
|
||||
|
||||
text = ''
|
||||
exec /var/lib/minecraft/run.sh $@
|
||||
|
@ -48,7 +51,7 @@
|
|||
};
|
||||
|
||||
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
|
||||
# to be up
|
||||
|
@ -60,7 +63,7 @@
|
|||
serviceConfig = {
|
||||
# Use packwiz to install mods
|
||||
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
|
||||
# little `run.sh` script
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue