diff options
| author | Lorenz Leutgeb <lorenz@leutgeb.xyz> | 2021-11-16 09:07:35 +0100 |
|---|---|---|
| committer | Lorenz Leutgeb <lorenz@leutgeb.xyz> | 2021-11-19 18:54:25 +0100 |
| commit | 01f4c7ec881a0a52638f090aacf51461a20b472f (patch) | |
| tree | 3f075b9ade2bc26bb6580a226264c51b29729acf /pkgs/games/mindustry/default.nix | |
| parent | 6b68d74f036def3d48a23969edfd0fa47f34af3e (diff) | |
gradle: Decouple gradleGen and JDK
Diffstat (limited to 'pkgs/games/mindustry/default.nix')
| -rw-r--r-- | pkgs/games/mindustry/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 2dbf32e825756..02ae1bfe9260b 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -3,8 +3,8 @@ , makeDesktopItem , copyDesktopItems , fetchFromGitHub -, gradleGen -, jdk +, gradle_6 +, jdk11 , perl # for arc @@ -87,8 +87,8 @@ let popd ''; - # The default one still uses jdk8 (#89731) - gradle_6 = (gradleGen.override (old: { java = jdk; })).gradle_6_9; + jdk = jdk11; + gradle = (gradle_6.override (old: { java = jdk11; })); # fake build to pre-download deps into fixed-output derivation deps = stdenv.mkDerivation { @@ -96,7 +96,7 @@ let inherit version unpackPhase patches; postPatch = cleanupMindustrySrc; - nativeBuildInputs = [ gradle_6 perl ]; + nativeBuildInputs = [ gradle 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. @@ -136,7 +136,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config - gradle_6 + gradle makeWrapper jdk ] ++ lib.optionals enableClient [ |