Committed after home build
diff --git a/users/minion/overlays/mindustry.nix b/users/minion/overlays/mindustry.nix
index bd4dbf6..8af98d2 100644
--- a/users/minion/overlays/mindustry.nix
+++ b/users/minion/overlays/mindustry.nix
@@ -1,6 +1,7 @@
final: prev: let
- version = "v135";
- depversion = "v116";
+ version = "135";
+
+ jdk = prev.adoptopenjdk-hotspot-bin-15;
Mindustry = final.fetchFromGitHub {
owner = "Anuken";
@@ -11,7 +12,7 @@
Arc = final.fetchFromGitHub {
owner = "Anuken";
repo = "Arc";
- rev = "v${depversion}";
+ rev = "v${version}";
sha256 = "pUUak5P9t4RmSdT+/oH/8oo6l7rjIN08XDJ06TcUn8I=";
};
soloud = final.fetchFromGitHub {
@@ -30,8 +31,42 @@
cp -r ${soloud} Arc/arc-core/csrc/soloud
chmod -R u+w -- Arc
'';
+
+ gradle_6 = (prev.gradleGen.override (old: { java = jdk; })).gradle_6_9;
+
+ enableClient = prev.enableClient or true;
+ enableServer = prev.enableServer or true;
in {
mindustry-alpha-wayland = prev.mindustry-wayland.overrideAttrs (old: {
inherit version unpackPhase;
+
+ nativeBuildInputs = [
+ prev.pkg-config
+ gradle_6
+ prev.makeWrapper
+ jdk
+ ] ++ prev.lib.optionals enableClient [
+ prev.ant
+ prev.copyDesktopItems
+ ];
+
+ meta.lib.broken = false;
+
+ installPhase = with prev.lib; ''
+ runHook preInstall
+ '' + optionalString enableClient ''
+ install -Dm644 desktop/build/libs/Mindustry.jar $out/share/mindustry.jar
+ mkdir -p $out/bin
+ makeWrapper ${jdk}/bin/java $out/bin/mindustry \
+ --add-flags "-jar $out/share/mindustry.jar"
+ install -Dm644 core/assets/icons/icon_64.png $out/share/icons/hicolor/64x64/apps/mindustry.png
+ '' + optionalString enableServer ''
+ install -Dm644 server/build/libs/server-release.jar $out/share/mindustry-server.jar
+ mkdir -p $out/bin
+ makeWrapper ${jdk}/bin/java $out/bin/mindustry-server \
+ --add-flags "-jar $out/share/mindustry-server.jar"
+ '' + ''
+ runHook postInstall
+ '';
});
}