pyrox.dev
Merge pull request #35221 from dtzWill/update/multimc-0.6.1
multimc: 0.5.1 -> 0.6.1
authored by Will Dietz and committed by GitHub 6e7adad6 6c4ac28b
+12
-34
pkgs/games/multimc/default.nix
+12
-34
pkgs/games/multimc/default.nix
···
1
-
{ stdenv, fetchFromGitHub, cmake, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, quazip }:
1
+
{ stdenv, fetchFromGitHub, cmake, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase }:
2
2
3
3
let
4
-
libnbt = fetchFromGitHub {
5
-
owner = "MultiMC";
6
-
repo = "libnbtplusplus";
7
-
rev = "4b305bb";
8
-
sha256 = "1zj7pxk0g5zl16hrngb4rss00hi019rylin7zgf18kaymc54nbcs";
9
-
};
10
-
in
11
-
stdenv.mkDerivation {
12
-
name = "multimc-0.5.1";
4
+
libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ];
5
+
in stdenv.mkDerivation rec {
6
+
name = "multimc-${version}";
7
+
version = "0.6.1";
13
8
src = fetchFromGitHub {
14
9
owner = "MultiMC";
15
10
repo = "MultiMC5";
16
-
rev = "0.5.1";
17
-
sha256 = "0wmlnwcq3gxrbmc53j96aa64pp1kmnlxiifhzngcb5kfmbbc8a20";
11
+
rev = version;
12
+
sha256 = "0glsf4vfir8w24bpinf3cx2ninrcp7hpq9cl463wl78dvqfg47kx";
13
+
fetchSubmodules = true;
18
14
};
19
-
buildInputs = [ cmake qtbase jdk zlib file makeWrapper ];
20
-
21
-
libpath = with xorg; [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ];
22
-
postUnpack = ''
23
-
rmdir $sourceRoot/libraries/libnbtplusplus
24
-
cp -r ${libnbt} $sourceRoot/libraries/libnbtplusplus
25
-
chmod 755 -R $sourceRoot/libraries/libnbtplusplus
26
-
mkdir -pv $sourceRoot/build/
27
-
cp -v ${quazip.src} $sourceRoot/build/quazip-0.7.1.tar.gz
28
-
'';
15
+
nativeBuildInputs = [ cmake file makeWrapper ];
16
+
buildInputs = [ qtbase jdk zlib ];
29
17
30
18
enableParallelBuilding = true;
31
19
32
-
# the install rule tries to bundle ALL deps into the output for portability
33
-
installPhase = ''
34
-
RESULT=/run/opengl-driver/lib/
35
-
for x in $libpath; do
36
-
RESULT=$x/lib/:$RESULT
37
-
done
38
-
39
-
mkdir -pv $out/bin/jars $out/lib
40
-
cp -v MultiMC $out/bin/
41
-
cp -v jars/*.jar $out/bin/jars/ #*/
42
-
cp -v libMultiMC_rainbow.so libMultiMC_nbt++.so libMultiMC_logic.so libMultiMC_gui.so $out/lib
43
-
wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH $RESULT --prefix PATH : ${jdk}/bin/
20
+
postInstall = ''
21
+
wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/
44
22
'';
45
23
46
24
meta = with stdenv.lib; {