From 9b540ccd6dc48fb8a7a87515d7562edfcd7097f6 Mon Sep 17 00:00:00 2001 From: Gaelan Steele Date: Wed, 1 Apr 2020 22:59:14 -0700 Subject: [PATCH] minecraft-server: build against jre_headlessRemoves an unnecessary dependency on gtk, etc. --- pkgs/games/minecraft-server/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 4751660af3a..956fbdf3aae 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, jre }: +{ stdenv, fetchurl, jre_headless }: stdenv.mkDerivation { pname = "minecraft-server"; version = "1.15.2"; src = fetchurl { - url = "https://launcher.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar"; + url = + "https://launcher.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar"; sha256 = "12kynrpxgcdg8x12wcvwkxka0fxgm5siqg8qq0nnmv0443f8dkw0"; }; @@ -16,7 +17,7 @@ stdenv.mkDerivation { cat > $out/bin/minecraft-server << EOF #!/bin/sh - exec ${jre}/bin/java \$@ -jar $out/lib/minecraft/server.jar nogui + exec ${jre_headless}/bin/java \$@ -jar $out/lib/minecraft/server.jar nogui EOF chmod +x $out/bin/minecraft-server @@ -24,11 +25,11 @@ stdenv.mkDerivation { phases = "installPhase"; - meta = { + meta = with stdenv.lib; { description = "Minecraft Server"; - homepage = "https://minecraft.net"; - license = stdenv.lib.licenses.unfreeRedistributable; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice tomberek costrouc]; + homepage = "https://minecraft.net"; + license = licenses.unfreeRedistributable; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice tomberek costrouc ]; }; }