diff options
author | Olli Helenius <liff@iki.fi> | 2023-11-30 16:00:51 +0200 |
---|---|---|
committer | Francesco Gazzetta <fgaz@fgaz.me> | 2023-12-13 06:57:34 +0000 |
commit | 4436b851bc2cee507eb409b91d87866e8be28ab2 (patch) | |
tree | 8ccd27297753897f90750cb1c9af8894ef9ece23 /pkgs/games/mindustry | |
parent | 2e3bbf451bef5aad0817d98e1c595e0ad51ec9a3 (diff) |
mindustry: match gradle and package JDK
Diffstat (limited to 'pkgs/games/mindustry')
-rw-r--r-- | pkgs/games/mindustry/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 2bf239579e4a4..d901fba57af7d 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -40,6 +40,8 @@ let version = "146"; buildVersion = makeBuildVersion version; + gradleWithJdk = gradle.override { java = jdk; }; + selectedGlew = if enableWayland then glew-egl else glew; Mindustry = fetchFromGitHub { @@ -114,7 +116,7 @@ let inherit version unpackPhase patches; postPatch = cleanupMindustrySrc; - nativeBuildInputs = [ gradle perl ]; + nativeBuildInputs = [ gradleWithJdk perl ]; # Here we download dependencies for both the server and the client so # we only have to specify one hash for 'deps'. Deps can be garbage # collected after the build, so this is not really an issue. @@ -149,7 +151,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config - gradle + gradleWithJdk makeWrapper jdk ] ++ lib.optionals enableClient [ |