mindustry-server: Fix
This commit is contained in:
parent
460ee23c73
commit
dfdb06dad3
|
@ -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
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue