From 19c06baf6c4bde49fbfb592d64ccac6ca69950d7 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Thu, 18 Nov 2021 23:04:17 +0100 Subject: [PATCH] mindustry: unbreak by building with jdk15 Fixes: https://github.com/NixOS/nixpkgs/issues/128929 --- pkgs/games/mindustry/default.nix | 4 +--- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 02ae1bfe9260..63892330b448 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -191,8 +191,6 @@ stdenv.mkDerivation rec { platforms = platforms.x86_64; # Hash mismatch on darwin: # https://github.com/NixOS/nixpkgs/pull/105590#issuecomment-737120293 - broken = stdenv.isDarwin - # does not work with any maintained java version (https://github.com/Anuken/Mindustry/issues/5114) - || true; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24b91291488a..934ff45541d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30290,8 +30290,8 @@ with pkgs; methane = callPackage ../games/methane { }; - mindustry = callPackage ../games/mindustry { }; - mindustry-wayland = callPackage ../games/mindustry { glew = glew-egl; }; + mindustry = callPackage ../games/mindustry { jdk = adoptopenjdk-hotspot-bin-15; }; + mindustry-wayland = callPackage ../games/mindustry { jdk = adoptopenjdk-hotspot-bin-15; glew = glew-egl; }; mindustry-server = callPackage ../games/mindustry { enableClient = false;