Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mindustry: unbreak #146557

Merged
merged 5 commits into from
Nov 25, 2021
Merged

mindustry: unbreak #146557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
19c06ba
mindustry: unbreak by building with jdk15
Mindavi Nov 18, 2021
7824302
mindustry: mitigate issue with missing glew
Mindavi Nov 18, 2021
a77943c
mindustry-server: use jdk15 to build server
Mindavi Nov 23, 2021
4179df3
mindustry: fix eval error due to #119444
Mindavi Nov 23, 2021
9e58e39
mindustry: format mindustry in top-level/all-packages nicely
Mindavi Nov 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions pkgs/games/mindustry/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
, copyDesktopItems
, fetchFromGitHub
, gradle_6
, jdk11
, jdk
, perl

# for arc
Expand Down Expand Up @@ -87,8 +87,7 @@ let
popd
'';

jdk = jdk11;
gradle = (gradle_6.override (old: { java = jdk11; }));
gradle = (gradle_6.override (old: { java = jdk; }));

# fake build to pre-download deps into fixed-output derivation
deps = stdenv.mkDerivation {
Expand Down Expand Up @@ -129,6 +128,15 @@ stdenv.mkDerivation rec {
rm Arc/backends/backend-sdl/libs/linux64/libsdl-arc*.so
'' + cleanupMindustrySrc;

# Propagate glew to prevent it from being cleaned up.
# Since a jar is a compressed archive, nix can't figure out that the dependency is actually in there,
# and will assume that it's not actually needed.
# This can cause issues.
# See https://github.com/NixOS/nixpkgs/issues/109798.
propagatedBuildInputs = lib.optionals enableClient [
glew.out
];

buildInputs = lib.optionals enableClient [
SDL2
glew
Expand Down Expand Up @@ -157,9 +165,11 @@ stdenv.mkDerivation rec {
'' + optionalString enableClient ''
gradle --offline --no-daemon jnigenBuild -Pbuildversion=${buildVersion}
gradle --offline --no-daemon sdlnatives -Pdynamic -Pbuildversion=${buildVersion}
glewlib=${lib.getLib glew}/lib/libGLEW.so
sdllib=${lib.getLib SDL2}/lib/libSDL2.so
Comment on lines +168 to +169
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
glewlib=${lib.getLib glew}/lib/libGLEW.so
sdllib=${lib.getLib SDL2}/lib/libSDL2.so

patchelf ../Arc/backends/backend-sdl/libs/linux64/libsdl-arc*.so \
--add-needed ${glew.out}/lib/libGLEW.so \
--add-needed ${SDL2}/lib/libSDL2.so
--add-needed $glewlib \
--add-needed $sdllib
Comment on lines +171 to +172
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
--add-needed $glewlib \
--add-needed $sdllib
--add-needed ${lib.getLib glew}/lib/libGLEW.so \
--add-needed ${lib.getLib SDL2}/lib/libSDL2.so

gradle --offline --no-daemon desktop:dist -Pbuildversion=${buildVersion}
'' + optionalString enableServer ''
gradle --offline --no-daemon server:dist -Pbuildversion=${buildVersion}
Expand Down Expand Up @@ -191,8 +201,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;
};
}
10 changes: 8 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30290,10 +30290,16 @@ 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 {
jdk = adoptopenjdk-hotspot-bin-15;
enableClient = false;
enableServer = true;
};
Expand Down