Merge pull request #319794 from Guanran928/minecraft-server

minecraft-server: 1.20.6 -> 1.21, add udev to LD_LIBRARY_PATH
This commit is contained in:
tomberek 2024-06-14 19:26:17 -04:00 committed by GitHub
commit 8c24c9e130
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 8 deletions

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, nixosTests, jre_headless, version, url, sha1 }:
{ lib, stdenv, fetchurl, nixosTests, jre_headless, makeWrapper, udev, version, url, sha1 }:
stdenv.mkDerivation {
pname = "minecraft-server";
inherit version;
@ -7,16 +7,18 @@ stdenv.mkDerivation {
preferLocalBuild = true;
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin $out/lib/minecraft
cp -v $src $out/lib/minecraft/server.jar
runHook preInstall
cat > $out/bin/minecraft-server << EOF
#!/bin/sh
exec ${jre_headless}/bin/java \$@ -jar $out/lib/minecraft/server.jar nogui
EOF
install -Dm644 $src $out/lib/minecraft/server.jar
chmod +x $out/bin/minecraft-server
makeWrapper ${lib.getExe jre_headless} $out/bin/minecraft-server \
--append-flags "-jar $out/lib/minecraft/server.jar nogui" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}
runHook postInstall
'';
dontUnpack = true;

View File

@ -1,4 +1,10 @@
{
"1.21": {
"sha1": "450698d1863ab5180c25d7c804ef0fe6369dd1ba",
"url": "https://piston-data.mojang.com/v1/objects/450698d1863ab5180c25d7c804ef0fe6369dd1ba/server.jar",
"version": "1.21",
"javaVersion": 21
},
"1.20": {
"sha1": "145ff0858209bcfc164859ba735d4199aafa1eea",
"url": "https://piston-data.mojang.com/v1/objects/145ff0858209bcfc164859ba735d4199aafa1eea/server.jar",