@@ -102,10 +102,6 @@ let
102102 popd
103103 '';
104104
105− preBuild = ''
106− export GRADLE_USER_HOME=$(mktemp -d)
107− '';
108−
109105 # The default one still uses jdk8 (#89731)
110106 gradle_6 = (gradleGen.override (old: { java = jdk; })).gradle_6_7;
111107
@@ -119,8 +115,9 @@ let
119115 # Here we download dependencies for both the server and the client so
120116 # we only have to specify one hash for 'deps'. Deps can be garbage
121117 # collected after the build, so this is not really an issue.
122− buildPhase = preBuild + ''
118+ buildPhase = ''
123119 pushd Mindustry
120+ export GRADLE_USER_HOME=$(mktemp -d)
124121 gradle --no-daemon resolveDependencies
125122 popd
126123 '';
@@ -136,7 +133,7 @@ let
136133 };
137134
138135in
139−assert stdenv.lib.assertMsg (enableClient || enableServer)
136+assert lib.assertMsg (enableClient || enableServer)
140137 "mindustry: at least one of 'enableClient' and 'enableServer' must be true";
141138stdenv.mkDerivation rec {
142139 inherit pname version unpackPhase patches;
@@ -147,7 +144,7 @@ stdenv.mkDerivation rec {
147144 rm Arc/backends/backend-sdl/libs/linux64/libsdl-arc*.so
148145 '' + cleanupMindustrySrc;
149146
150− buildInputs = [
147+ buildInputs = lib.optionals enableClient [
151148 SDL2
152149 glew
153150 alsaLib
@@ -157,13 +154,16 @@ stdenv.mkDerivation rec {
157154 gradle_6
158155 makeWrapper
159156 jdk
157+ ] ++ lib.optionals enableClient [
160158 ant
161159 copyDesktopItems
162160 ];
163161
164− desktopItems = [ desktopItem ];
162+ desktopItems = lib.optional enableClient desktopItem;
163+
164+ buildPhase = with lib; ''
165+ export GRADLE_USER_HOME=$(mktemp -d)
165166
166− buildPhase = with stdenv.lib; preBuild + ''
167167 # point to offline repo
168168 sed -ie "s#mavenLocal()#mavenLocal(); maven { url '${deps}' }#g" Mindustry/build.gradle
169169 sed -ie "s#mavenCentral()#mavenCentral(); maven { url '${deps}' }#g" Arc/build.gradle
@@ -180,7 +180,9 @@ stdenv.mkDerivation rec {
180180 gradle --offline --no-daemon server:dist -Pbuildversion=${buildVersion}
181181 '';
182182
183− installPhase = with stdenv.lib; optionalString enableClient ''
183+ installPhase = with lib; ''
184+ runHook preInstall
185+ '' + optionalString enableClient ''
184186 install -Dm644 desktop/build/libs/Mindustry.jar $out/share/mindustry.jar
185187 mkdir -p $out/bin
186188 makeWrapper ${jdk}/bin/java $out/bin/mindustry \
@@ -191,6 +193,8 @@ stdenv.mkDerivation rec {
191193 mkdir -p $out/bin
192194 makeWrapper ${jdk}/bin/java $out/bin/mindustry-server \
193195 --add-flags "-jar $out/share/mindustry-server.jar"
196+ '' + ''
197+ runHook postInstall
194198 '';
195199
196200 meta = with lib; {