aboutsummaryrefslogtreecommitdiff
path: root/packages/nix
diff options
context:
space:
mode:
Diffstat (limited to 'packages/nix')
-rw-r--r--packages/nix/NIX.md4
-rw-r--r--packages/nix/polymc/0001-pick-latest-java-first.patch48
-rw-r--r--packages/nix/polymc/default.nix21
3 files changed, 3 insertions, 70 deletions
diff --git a/packages/nix/NIX.md b/packages/nix/NIX.md
index f778dac1..1ceba9a3 100644
--- a/packages/nix/NIX.md
+++ b/packages/nix/NIX.md
@@ -8,7 +8,7 @@ inputs = {
...
-nixpkgs.overlays = [ inputs.polymc.overlay.${system} ]; ## Within configuration.nix
+nixpkgs.overlays = [ inputs.polymc.overlay ]; ## Within configuration.nix
environment.systemPackages = with pkgs; [ polymc ]; ##
```
@@ -28,4 +28,4 @@ nixpkgs.overlays = [
];
environment.systemPackages = with pkgs; [ polymc ];
-``` \ No newline at end of file
+```
diff --git a/packages/nix/polymc/0001-pick-latest-java-first.patch b/packages/nix/polymc/0001-pick-latest-java-first.patch
deleted file mode 100644
index a65dcbfd..00000000
--- a/packages/nix/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/packages/nix/polymc/default.nix b/packages/nix/polymc/default.nix
index f49e59bb..e65a7e34 100644
--- a/packages/nix/polymc/default.nix
+++ b/packages/nix/polymc/default.nix
@@ -1,7 +1,6 @@
{ lib
, mkDerivation
, fetchFromGitHub
-, makeDesktopItem
, cmake
, ninja
, jdk8
@@ -48,8 +47,6 @@ mkDerivation rec {
dontWrapQtApps = true;
- patches = [ ./0001-pick-latest-java-first.patch ];
-
postPatch = ''
# hardcode jdk paths
substituteInPlace launcher/java/JavaUtils.cpp \
@@ -75,27 +72,11 @@ mkDerivation rec {
"-DLauncher_LAYOUT=lin-system"
];
- desktopItem = makeDesktopItem {
- name = "polymc";
- exec = "polymc";
- icon = "polymc";
- desktopName = "PolyMC";
- genericName = "Minecraft Launcher";
- comment = "A custom launcher for Minecraft";
- categories = "Game;";
- extraEntries = ''
- Keywords=game;Minecraft;
- '';
- };
-
postInstall = ''
- install -Dm644 ../launcher/resources/multimc/scalable/launcher.svg $out/share/pixmaps/polymc.svg
- install -Dm644 ${desktopItem}/share/applications/polymc.desktop $out/share/applications/org.polymc.PolyMC.desktop
-
# xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
wrapProgram $out/bin/polymc \
"''${qtWrapperArgs[@]}" \
--set GAME_LIBRARY_PATH ${gameLibraryPath} \
- --prefix PATH : ${lib.makeBinPath [ xorg.xrandr jdk ]}
+ --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]}
'';
}