jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mindustry,mindustry-server: 104.6 -> 120 (#105590)

Browse Source 
* mindustry,mindustry-server: 104.6 -> 120

* mindustry,mindustry-server: remove trailing space
This commit is contained in:
Francesco Gazzetta 2020-12-01 16:44:51 +00:00 committed by GitHub
parent b5a328e58f
commit 48d423ee2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/games/mindustry/default.nix
View File

@ -2,10 +2,11 @@
, makeWrapper , makeWrapper
, makeDesktopItem , makeDesktopItem
, fetchFromGitHub , fetchFromGitHub
, gradle_5 , gradleGen
, jdk14
, perl , perl
, jre , jre
, libpulseaudio , alsaLib
# Make the build version easily overridable. # Make the build version easily overridable.
# Server and client build versions must match, and an empty build version means # Server and client build versions must match, and an empty build version means
@ -21,14 +22,14 @@ let
# Note: when raising the version, ensure that all SNAPSHOT versions in # Note: when raising the version, ensure that all SNAPSHOT versions in
# build.gradle are replaced by a fixed version # build.gradle are replaced by a fixed version
# (the current one at the time of release) (see postPatch). # (the current one at the time of release) (see postPatch).
version = "104.6"; version = "120";
buildVersion = makeBuildVersion version; buildVersion = makeBuildVersion version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Anuken"; owner = "Anuken";
repo = "Mindustry"; repo = "Mindustry";
rev = "v${version}"; rev = "v${version}";
sha256 = "1crdfiymaz57gnma6bmdcsnbl635nhjdndrjv467c4xfq9vvap2i"; sha256 = "08l5c53izh5vmgahsj0qhpfiva0vs5qhh77bb770hzpadxvysyc8";
}; };
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
@ -49,11 +50,14 @@ let
sed -i 's/com.github.anuken:packr:-SNAPSHOT/com.github.anuken:packr:034efe51781d2d8faa90370492133241bfb0283c/' build.gradle sed -i 's/com.github.anuken:packr:-SNAPSHOT/com.github.anuken:packr:034efe51781d2d8faa90370492133241bfb0283c/' build.gradle
''; '';
# The default one still uses jdk8 (#89731)
gradle_6 = (gradleGen.override (old: { java = jdk14; })).gradle_6_7;
# fake build to pre-download deps into fixed-output derivation # fake build to pre-download deps into fixed-output derivation
deps = stdenv.mkDerivation { deps = stdenv.mkDerivation {
pname = "${pname}-deps"; pname = "${pname}-deps";
inherit version src postPatch; inherit version src postPatch;
nativeBuildInputs = [ gradle_5 perl ]; nativeBuildInputs = [ gradle_6 perl ];
# Here we build both the server and the client so we only have to specify # Here we build both the server and the client so we only have to specify
# one hash for 'deps'. Deps can be garbage collected after the build, # one hash for 'deps'. Deps can be garbage collected after the build,
# so this is not really an issue. # so this is not really an issue.
@ -70,7 +74,7 @@ let
''; '';
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHash = "08yrczz1qn78qy3x67gs7d0xvihbfbb8ggiczq2nj812745zcizw"; outputHash = "1yv9l8zdml6drmvlgv45w3qas9qmb654x4kja3an4d16k020khr7";
}; };
# Separate commands for building and installing the server and the client # Separate commands for building and installing the server and the client
@ -84,7 +88,7 @@ let
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 ${jre}/bin/java $out/bin/mindustry \ makeWrapper ${jre}/bin/java $out/bin/mindustry \
--prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib \ ${stdenv.lib.optionalString stdenv.isLinux "--prefix LD_LIBRARY_PATH : ${alsaLib}/lib"} \
--add-flags "-jar $out/share/mindustry.jar" --add-flags "-jar $out/share/mindustry.jar"
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
install -Dm644 ${desktopItem}/share/applications/Mindustry.desktop $out/share/applications/Mindustry.desktop install -Dm644 ${desktopItem}/share/applications/Mindustry.desktop $out/share/applications/Mindustry.desktop
@ -102,7 +106,7 @@ assert stdenv.lib.assertMsg (enableClient || enableServer)
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit pname version src postPatch; inherit pname version src postPatch;
nativeBuildInputs = [ gradle_5 makeWrapper ]; nativeBuildInputs = [ gradle_6 makeWrapper ];
buildPhase = with stdenv.lib; '' buildPhase = with stdenv.lib; ''
export GRADLE_USER_HOME=$(mktemp -d) export GRADLE_USER_HOME=$(mktemp -d)
@ -126,4 +130,3 @@ stdenv.mkDerivation rec {
platforms = platforms.all; platforms = platforms.all;
}; };
} }