cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

mindustry: match gradle and package JDK

Browse source
This commit is contained in:
Olli Helenius 2023-11-30 16:00:51 +02:00 committed by Francesco Gazzetta
parent 2e3bbf451b
commit 4436b851bc
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/games/mindustry/default.nix
View file

@ -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 [