Merge pull request #157116 from muscaln/polymc
This commit is contained in:
commit
9e61c9c064
@ -1,48 +0,0 @@
|
|||||||
From 44e1b2a19a869b907b40e56c85c8a47aa6c22097 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <musfay@protonmail.com>
|
|
||||||
Date: Tue, 22 Jun 2021 21:50:11 +0300
|
|
||||||
Subject: [PATCH] pick latest java first
|
|
||||||
|
|
||||||
---
|
|
||||||
launcher/java/JavaInstallList.cpp | 4 ++--
|
|
||||||
launcher/java/JavaUtils.cpp | 2 +-
|
|
||||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/launcher/java/JavaInstallList.cpp b/launcher/java/JavaInstallList.cpp
|
|
||||||
index 0bded03c..40898e20 100644
|
|
||||||
--- a/launcher/java/JavaInstallList.cpp
|
|
||||||
+++ b/launcher/java/JavaInstallList.cpp
|
|
||||||
@@ -120,8 +120,8 @@ void JavaInstallList::updateListData(QList<BaseVersionPtr> versions)
|
|
||||||
|
|
||||||
bool sortJavas(BaseVersionPtr left, BaseVersionPtr right)
|
|
||||||
{
|
|
||||||
- auto rleft = std::dynamic_pointer_cast<JavaInstall>(left);
|
|
||||||
- auto rright = std::dynamic_pointer_cast<JavaInstall>(right);
|
|
||||||
+ auto rleft = std::dynamic_pointer_cast<JavaInstall>(right);
|
|
||||||
+ auto rright = std::dynamic_pointer_cast<JavaInstall>(left);
|
|
||||||
return (*rleft) > (*rright);
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp
|
|
||||||
index 5f004a10..6d633631 100644
|
|
||||||
--- a/launcher/java/JavaUtils.cpp
|
|
||||||
+++ b/launcher/java/JavaUtils.cpp
|
|
||||||
@@ -350,7 +350,6 @@ QList<QString> JavaUtils::FindJavaPaths()
|
|
||||||
qDebug() << "Linux Java detection incomplete - defaulting to \"java\"";
|
|
||||||
|
|
||||||
QList<QString> javas;
|
|
||||||
- javas.append(this->GetDefaultJava()->path);
|
|
||||||
auto scanJavaDir = [&](const QString & dirPath)
|
|
||||||
{
|
|
||||||
QDir dir(dirPath);
|
|
||||||
@@ -379,6 +378,7 @@ QList<QString> JavaUtils::FindJavaPaths()
|
|
||||||
// general locations used by distro packaging
|
|
||||||
scanJavaDir("/usr/lib/jvm");
|
|
||||||
scanJavaDir("/usr/lib32/jvm");
|
|
||||||
+ javas.append(this->GetDefaultJava()->path);
|
|
||||||
// javas stored in MultiMC's folder
|
|
||||||
scanJavaDir("java");
|
|
||||||
return javas;
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, mkDerivation
|
, mkDerivation
|
||||||
, makeDesktopItem
|
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, cmake
|
, cmake
|
||||||
, jdk8
|
, jdk8
|
||||||
@ -17,21 +16,19 @@
|
|||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "polymc";
|
pname = "polymc";
|
||||||
version = "1.0.4";
|
version = "1.0.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "PolyMC";
|
owner = "PolyMC";
|
||||||
repo = "PolyMC";
|
repo = "PolyMC";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-8aya0KfV9F+i2qBpweWcR9hwyTSQkqn2wHdtkCEeNvk=";
|
sha256 = "sha256-KgLWbZxtxTpuFdMOJNyADYw9rMWoLgczrbSrH4qv6NI=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake file makeWrapper ];
|
nativeBuildInputs = [ cmake file makeWrapper ];
|
||||||
buildInputs = [ qtbase jdk8 zlib ];
|
buildInputs = [ qtbase jdk8 zlib ];
|
||||||
|
|
||||||
patches = [ ./0001-pick-latest-java-first.patch ];
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
# hardcode jdk paths
|
# hardcode jdk paths
|
||||||
substituteInPlace launcher/java/JavaUtils.cpp \
|
substituteInPlace launcher/java/JavaUtils.cpp \
|
||||||
@ -42,19 +39,6 @@ mkDerivation rec {
|
|||||||
cmakeFlags = [ "-DLauncher_LAYOUT=lin-system" ] ++
|
cmakeFlags = [ "-DLauncher_LAYOUT=lin-system" ] ++
|
||||||
lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ];
|
lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ];
|
||||||
|
|
||||||
desktopItems = [
|
|
||||||
(makeDesktopItem {
|
|
||||||
name = "polymc";
|
|
||||||
desktopName = "PolyMC";
|
|
||||||
genericName = "Minecraft Launcher";
|
|
||||||
comment = "Free, open source launcher and instance manager for Minecraft.";
|
|
||||||
icon = "launcher";
|
|
||||||
exec = "polymc";
|
|
||||||
categories = "Game";
|
|
||||||
terminal = "false";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
dontWrapQtApps = true;
|
dontWrapQtApps = true;
|
||||||
|
|
||||||
postInstall = let
|
postInstall = let
|
||||||
@ -68,8 +52,6 @@ mkDerivation rec {
|
|||||||
libGL
|
libGL
|
||||||
];
|
];
|
||||||
in ''
|
in ''
|
||||||
install -Dm644 ../launcher/resources/multimc/scalable/launcher.svg $out/share/pixmaps/polymc.svg
|
|
||||||
|
|
||||||
# xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
|
# xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
|
||||||
wrapProgram $out/bin/polymc \
|
wrapProgram $out/bin/polymc \
|
||||||
"''${qtWrapperArgs[@]}" \
|
"''${qtWrapperArgs[@]}" \
|
||||||
|
Loading…
Reference in New Issue
Block a user