git.iko.soy/typeable/nixpkgs
on master help sign in
mindustry,mindustry-server: 104.6 -> 120 (#105590)

* mindustry,mindustry-server: 104.6 -> 120 * mindustry,mindustry-server: remove trailing space

commit48d423ee2a22adb30f89899c82f7e12821c7455b authorFrancesco Gazzetta <fgaz@fgaz.me> dateTue 1 Dec 2020, 16:44 (6 years ago) parentb5a328e
1 file changed+12−9
pkgs/games/mindustry/default.nix+12−9
pkgs/games/mindustry/default.nix+12−9
@@ -2,10 +2,11 @@
22, makeWrapper
33, makeDesktopItem
44, fetchFromGitHub
5−, gradle_5
5+, gradleGen
6+, jdk14
67, perl
78, jre
8−, libpulseaudio
9+, alsaLib
910
1011# Make the build version easily overridable.
1112# Server and client build versions must match, and an empty build version means
@@ -21,14 +22,14 @@ let
2122 # Note: when raising the version, ensure that all SNAPSHOT versions in
2223 # build.gradle are replaced by a fixed version
2324 # (the current one at the time of release) (see postPatch).
24− version = "104.6";
25+ version = "120";
2526 buildVersion = makeBuildVersion version;
2627
2728 src = fetchFromGitHub {
2829 owner = "Anuken";
2930 repo = "Mindustry";
3031 rev = "v${version}";
31− sha256 = "1crdfiymaz57gnma6bmdcsnbl635nhjdndrjv467c4xfq9vvap2i";
32+ sha256 = "08l5c53izh5vmgahsj0qhpfiva0vs5qhh77bb770hzpadxvysyc8";
3233 };
3334
3435 desktopItem = makeDesktopItem {
@@ -49,11 +50,14 @@ let
4950 sed -i 's/com.github.anuken:packr:-SNAPSHOT/com.github.anuken:packr:034efe51781d2d8faa90370492133241bfb0283c/' build.gradle
5051 '';
5152
53+ # The default one still uses jdk8 (#89731)
54+ gradle_6 = (gradleGen.override (old: { java = jdk14; })).gradle_6_7;
55+
5256 # fake build to pre-download deps into fixed-output derivation
5357 deps = stdenv.mkDerivation {
5458 pname = "${pname}-deps";
5559 inherit version src postPatch;
56− nativeBuildInputs = [ gradle_5 perl ];
60+ nativeBuildInputs = [ gradle_6 perl ];
5761 # Here we build both the server and the client so we only have to specify
5862 # one hash for 'deps'. Deps can be garbage collected after the build,
5963 # so this is not really an issue.
@@ -70,7 +74,7 @@ let
7074 '';
7175 outputHashAlgo = "sha256";
7276 outputHashMode = "recursive";
73− outputHash = "08yrczz1qn78qy3x67gs7d0xvihbfbb8ggiczq2nj812745zcizw";
77+ outputHash = "1yv9l8zdml6drmvlgv45w3qas9qmb654x4kja3an4d16k020khr7";
7478 };
7579
7680 # Separate commands for building and installing the server and the client
@@ -84,7 +88,7 @@ let
8488 install -Dm644 desktop/build/libs/Mindustry.jar $out/share/mindustry.jar
8589 mkdir -p $out/bin
8690 makeWrapper ${jre}/bin/java $out/bin/mindustry \
87− --prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib \
91+ ${stdenv.lib.optionalString stdenv.isLinux "--prefix LD_LIBRARY_PATH : ${alsaLib}/lib"} \
8892 --add-flags "-jar $out/share/mindustry.jar"
8993 install -Dm644 core/assets/icons/icon_64.png $out/share/icons/hicolor/64x64/apps/mindustry.png
9094 install -Dm644 ${desktopItem}/share/applications/Mindustry.desktop $out/share/applications/Mindustry.desktop
@@ -102,7 +106,7 @@ assert stdenv.lib.assertMsg (enableClient || enableServer)
102106stdenv.mkDerivation rec {
103107 inherit pname version src postPatch;
104108
105− nativeBuildInputs = [ gradle_5 makeWrapper ];
109+ nativeBuildInputs = [ gradle_6 makeWrapper ];
106110
107111 buildPhase = with stdenv.lib; ''
108112 export GRADLE_USER_HOME=$(mktemp -d)
@@ -126,4 +130,3 @@ stdenv.mkDerivation rec {
126130 platforms = platforms.all;
127131 };
128132}
129−