dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

mindustry: unbreak by building with jdk15

Browse Source 
Fixes: https://github.com/NixOS/nixpkgs/issues/128929
This commit is contained in:
Rick van Schijndel 2021-11-18 23:04:17 +01:00
parent e8ecc402a5
commit 19c06baf6c
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/games/mindustry/default.nix
View File

@ -191,8 +191,6 @@ stdenv.mkDerivation rec {
platforms = platforms.x86_64; platforms = platforms.x86_64;
# Hash mismatch on darwin: # Hash mismatch on darwin:
# https://github.com/NixOS/nixpkgs/pull/105590#issuecomment-737120293 # https://github.com/NixOS/nixpkgs/pull/105590#issuecomment-737120293
broken = stdenv.isDarwin broken = stdenv.isDarwin;
# does not work with any maintained java version (https://github.com/Anuken/Mindustry/issues/5114)
|| true;
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -30290,8 +30290,8 @@ with pkgs;
methane = callPackage ../games/methane { }; methane = callPackage ../games/methane { };
mindustry = callPackage ../games/mindustry { }; mindustry = callPackage ../games/mindustry { jdk = adoptopenjdk-hotspot-bin-15; };
mindustry-wayland = callPackage ../games/mindustry { glew = glew-egl; }; mindustry-wayland = callPackage ../games/mindustry { jdk = adoptopenjdk-hotspot-bin-15; glew = glew-egl; };
mindustry-server = callPackage ../games/mindustry { mindustry-server = callPackage ../games/mindustry {
enableClient = false; enableClient = false;