pyrox.dev
multimc: unstable-2021-06-21 -> unstable-2021-09-08
vriska.bsky.social
+8
-8
pkgs/games/multimc/0001-pick-latest-java-first.patch
+8
-8
pkgs/games/multimc/0001-pick-latest-java-first.patch
···
4
4
Subject: [PATCH] pick latest java first
5
5
6
6
---
7
-
api/logic/java/JavaInstallList.cpp | 4 ++--
8
-
api/logic/java/JavaUtils.cpp | 2 +-
7
+
launcher/java/JavaInstallList.cpp | 4 ++--
8
+
launcher/java/JavaUtils.cpp | 2 +-
9
9
2 files changed, 3 insertions(+), 3 deletions(-)
10
10
11
-
diff --git a/api/logic/java/JavaInstallList.cpp b/api/logic/java/JavaInstallList.cpp
11
+
diff --git a/launcher/java/JavaInstallList.cpp b/launcher/java/JavaInstallList.cpp
12
12
index 0bded03c..40898e20 100644
13
-
--- a/api/logic/java/JavaInstallList.cpp
14
-
+++ b/api/logic/java/JavaInstallList.cpp
13
+
--- a/launcher/java/JavaInstallList.cpp
14
+
+++ b/launcher/java/JavaInstallList.cpp
15
15
@@ -120,8 +120,8 @@ void JavaInstallList::updateListData(QList<BaseVersionPtr> versions)
16
16
17
17
bool sortJavas(BaseVersionPtr left, BaseVersionPtr right)
···
23
23
return (*rleft) > (*rright);
24
24
}
25
25
26
-
diff --git a/api/logic/java/JavaUtils.cpp b/api/logic/java/JavaUtils.cpp
26
+
diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp
27
27
index 5f004a10..6d633631 100644
28
-
--- a/api/logic/java/JavaUtils.cpp
29
-
+++ b/api/logic/java/JavaUtils.cpp
28
+
--- a/launcher/java/JavaUtils.cpp
29
+
+++ b/launcher/java/JavaUtils.cpp
30
30
@@ -350,7 +350,6 @@ QList<QString> JavaUtils::FindJavaPaths()
31
31
qDebug() << "Linux Java detection incomplete - defaulting to \"java\"";
32
32
+6
-6
pkgs/games/multimc/default.nix
+6
-6
pkgs/games/multimc/default.nix
···
4
4
libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio libGL ];
5
5
in mkDerivation rec {
6
6
pname = "multimc";
7
-
version = "unstable-2021-06-21";
7
+
version = "unstable-2021-09-08";
8
8
src = fetchFromGitHub {
9
9
owner = "MultiMC";
10
10
repo = "MultiMC5";
11
-
rev = "8179a89103833805d5374399d80a4305be1b8355";
12
-
sha256 = "lPz6ZM7TjaixfwWMPaXijKZJQKFPrCegBhvbJ8Xg4P8=";
11
+
rev = "e2355eb276bf355ca4acf526a0f3cc390aa88f8b";
12
+
sha256 = "3G9QPoAbC+uVfUYR0Kq6hnxl9c2mvCzIEYGjwfarQJ8=";
13
13
fetchSubmodules = true;
14
14
};
15
15
nativeBuildInputs = [ cmake file makeWrapper ];
···
19
19
20
20
postPatch = ''
21
21
# hardcode jdk paths
22
-
substituteInPlace api/logic/java/JavaUtils.cpp \
22
+
substituteInPlace launcher/java/JavaUtils.cpp \
23
23
--replace 'scanJavaDir("/usr/lib/jvm")' 'javas.append("${jdk}/lib/openjdk/bin/java")' \
24
24
--replace 'scanJavaDir("/usr/lib32/jvm")' 'javas.append("${jdk8}/lib/openjdk/bin/java")'
25
25
'';
···
27
27
cmakeFlags = [ "-DMultiMC_LAYOUT=lin-system" ];
28
28
29
29
postInstall = ''
30
-
install -Dm644 ../application/resources/multimc/scalable/multimc.svg $out/share/pixmaps/multimc.svg
31
-
install -Dm755 ../application/package/linux/multimc.desktop $out/share/applications/multimc.desktop
30
+
install -Dm644 ../launcher/resources/multimc/scalable/multimc.svg $out/share/pixmaps/multimc.svg
31
+
install -Dm755 ../launcher/package/linux/multimc.desktop $out/share/applications/multimc.desktop
32
32
33
33
# xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
34
34
wrapProgram $out/bin/multimc \