diff options
author | Mustafa Çalışkan <muscaln@protonmail.com> | 2022-01-27 17:45:08 +0300 |
---|---|---|
committer | Mustafa Çalışkan <muscaln@protonmail.com> | 2022-01-28 13:03:01 +0300 |
commit | 37df4305c65ab6d3f34beebbacca491b4d122769 (patch) | |
tree | 923205bbb481b2c65fb8cf1592433890f141ce6a /pkgs/games | |
parent | 51d92e5c6ee331489c9fa0e297fad6a7d41ddb53 (diff) | |
download | nixpkgs-37df4305c65ab6d3f34beebbacca491b4d122769.tar nixpkgs-37df4305c65ab6d3f34beebbacca491b4d122769.tar.gz nixpkgs-37df4305c65ab6d3f34beebbacca491b4d122769.tar.bz2 nixpkgs-37df4305c65ab6d3f34beebbacca491b4d122769.tar.lz nixpkgs-37df4305c65ab6d3f34beebbacca491b4d122769.tar.xz nixpkgs-37df4305c65ab6d3f34beebbacca491b4d122769.tar.zst nixpkgs-37df4305c65ab6d3f34beebbacca491b4d122769.zip |
polymc: 1.0.4 -> 1.0.6
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/polymc/0001-pick-latest-java-first.patch | 48 | ||||
-rw-r--r-- | pkgs/games/polymc/default.nix | 22 |
2 files changed, 2 insertions, 68 deletions
diff --git a/pkgs/games/polymc/0001-pick-latest-java-first.patch b/pkgs/games/polymc/0001-pick-latest-java-first.patch deleted file mode 100644 index a65dcbfd037..00000000000 --- a/pkgs/games/polymc/0001-pick-latest-java-first.patch +++ /dev/null @@ -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 - diff --git a/pkgs/games/polymc/default.nix b/pkgs/games/polymc/default.nix index ddfc76b8b97..0d63a8ad5f9 100644 --- a/pkgs/games/polymc/default.nix +++ b/pkgs/games/polymc/default.nix @@ -1,6 +1,5 @@ { lib , mkDerivation -, makeDesktopItem , fetchFromGitHub , cmake , jdk8 @@ -17,21 +16,19 @@ mkDerivation rec { pname = "polymc"; - version = "1.0.4"; + version = "1.0.6"; src = fetchFromGitHub { owner = "PolyMC"; repo = "PolyMC"; rev = version; - sha256 = "sha256-8aya0KfV9F+i2qBpweWcR9hwyTSQkqn2wHdtkCEeNvk="; + sha256 = "sha256-KgLWbZxtxTpuFdMOJNyADYw9rMWoLgczrbSrH4qv6NI="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake file makeWrapper ]; buildInputs = [ qtbase jdk8 zlib ]; - patches = [ ./0001-pick-latest-java-first.patch ]; - postPatch = '' # hardcode jdk paths substituteInPlace launcher/java/JavaUtils.cpp \ @@ -42,19 +39,6 @@ mkDerivation rec { cmakeFlags = [ "-DLauncher_LAYOUT=lin-system" ] ++ 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; postInstall = let @@ -68,8 +52,6 @@ mkDerivation rec { libGL ]; 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 wrapProgram $out/bin/polymc \ "''${qtWrapperArgs[@]}" \ |