b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

mindustry-server: Fix

Browse source
This commit is contained in:
Scott Worley 2023-05-24 07:41:40 -07:00
parent 460ee23c73
commit dfdb06dad3
1 changed files with 34 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -191,9 +191,8 @@ stdenv.mkDerivation rec {
gradle --offline --no-daemon server:dist -Pbuildversion=${buildVersion} gradle --offline --no-daemon server:dist -Pbuildversion=${buildVersion}
''; '';
installPhase = with lib; '' installPhase = with lib; let
runHook preInstall installClient = ''
'' + optionalString enableClient ''
install -Dm644 desktop/build/libs/Mindustry.jar $out/share/mindustry.jar install -Dm644 desktop/build/libs/Mindustry.jar $out/share/mindustry.jar
mkdir -p $out/bin mkdir -p $out/bin
makeWrapper ${jdk}/bin/java $out/bin/mindustry \ makeWrapper ${jdk}/bin/java $out/bin/mindustry \
@ -215,12 +214,18 @@ stdenv.mkDerivation rec {
done done
install -Dm644 core/assets/icons/icon_64.png $out/share/icons/hicolor/64x64/apps/mindustry.png install -Dm644 core/assets/icons/icon_64.png $out/share/icons/hicolor/64x64/apps/mindustry.png
'' + optionalString enableServer '' '';
installServer = ''
install -Dm644 server/build/libs/server-release.jar $out/share/mindustry-server.jar install -Dm644 server/build/libs/server-release.jar $out/share/mindustry-server.jar
mkdir -p $out/bin mkdir -p $out/bin
makeWrapper ${jdk}/bin/java $out/bin/mindustry-server \ makeWrapper ${jdk}/bin/java $out/bin/mindustry-server \
--add-flags "-jar $out/share/mindustry-server.jar" --add-flags "-jar $out/share/mindustry-server.jar"
'' + '' '';
in ''
runHook preInstall
'' + optionalString enableClient installClient
+ optionalString enableServer installServer
+ ''
runHook postInstall runHook postInstall
''; '';