diff options
Diffstat (limited to 'pkgs/games/multimc')
-rw-r--r-- | pkgs/games/multimc/0001-pick-latest-java-first.patch | 48 | ||||
-rw-r--r-- | pkgs/games/multimc/default.nix | 29 |
2 files changed, 67 insertions, 10 deletions
diff --git a/pkgs/games/multimc/0001-pick-latest-java-first.patch b/pkgs/games/multimc/0001-pick-latest-java-first.patch new file mode 100644 index 00000000000..31ab0497f8d --- /dev/null +++ b/pkgs/games/multimc/0001-pick-latest-java-first.patch @@ -0,0 +1,48 @@ +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 + +--- + api/logic/java/JavaInstallList.cpp | 4 ++-- + api/logic/java/JavaUtils.cpp | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/api/logic/java/JavaInstallList.cpp b/api/logic/java/JavaInstallList.cpp +index 0bded03c..40898e20 100644 +--- a/api/logic/java/JavaInstallList.cpp ++++ b/api/logic/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/api/logic/java/JavaUtils.cpp b/api/logic/java/JavaUtils.cpp +index 5f004a10..6d633631 100644 +--- a/api/logic/java/JavaUtils.cpp ++++ b/api/logic/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 + diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index bcdd950de4a..aa32efaa940 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -1,21 +1,28 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase }: +{ lib, mkDerivation, fetchFromGitHub, cmake, jdk8, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL }: let - libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; + libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio libGL ]; in mkDerivation rec { pname = "multimc"; - version = "0.6.11"; + version = "unstable-2021-06-21"; src = fetchFromGitHub { owner = "MultiMC"; repo = "MultiMC5"; - rev = version; - sha256 = "1jkbmb4sgfk8d93f5l1vd9pkpvhq9sxacc61w0rvf5xmz0wnszmz"; + rev = "8179a89103833805d5374399d80a4305be1b8355"; + sha256 = "lPz6ZM7TjaixfwWMPaXijKZJQKFPrCegBhvbJ8Xg4P8="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake file makeWrapper ]; - buildInputs = [ qtbase jdk zlib ]; + buildInputs = [ qtbase jdk8 zlib ]; - enableParallelBuilding = true; + patches = [ ./0001-pick-latest-java-first.patch ]; + + postPatch = '' + # hardcode jdk paths + substituteInPlace api/logic/java/JavaUtils.cpp \ + --replace 'scanJavaDir("/usr/lib/jvm")' 'javas.append("${jdk}/lib/openjdk/bin/java")' \ + --replace 'scanJavaDir("/usr/lib32/jvm")' 'javas.append("${jdk8}/lib/openjdk/bin/java")' + ''; cmakeFlags = [ "-DMultiMC_LAYOUT=lin-system" ]; @@ -24,10 +31,12 @@ in mkDerivation rec { install -Dm755 ../application/package/linux/multimc.desktop $out/share/applications/multimc.desktop # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 - wrapProgram $out/bin/multimc --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/:${xorg.xrandr}/bin/ + wrapProgram $out/bin/multimc \ + --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \ + --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://multimc.org/"; description = "A free, open source launcher for Minecraft"; longDescription = '' @@ -35,6 +44,6 @@ in mkDerivation rec { ''; platforms = platforms.linux; license = licenses.lgpl21Plus; - maintainers = [ maintainers.cleverca22 ]; + maintainers = with maintainers; [ cleverca22 starcraft66 ]; }; } |