From fc81b81c26b64e051b494bf16e4fe3c694c0503d Mon Sep 17 00:00:00 2001 From: cidkidnix Date: Sat, 8 Jan 2022 01:33:26 -0600 Subject: [PATCH 1/8] Add nixos support --- flake.nix | 9 ++++ nix/polymc/0001-pick-latest-java-first.patch | 48 ++++++++++++++++++++ nix/polymc/default.nix | 47 +++++++++++++++++++ 3 files changed, 104 insertions(+) create mode 100644 flake.nix create mode 100644 nix/polymc/0001-pick-latest-java-first.patch create mode 100644 nix/polymc/default.nix diff --git a/flake.nix b/flake.nix new file mode 100644 index 000000000..1d9f8b643 --- /dev/null +++ b/flake.nix @@ -0,0 +1,9 @@ +{ + description = "PolyMC"; + + outputs = inputs: { + overlay = self: super: rec { + polymc = super.libsForQt5.callPackage ./nix/polymc {}; + }; + }; +} \ No newline at end of file diff --git a/nix/polymc/0001-pick-latest-java-first.patch b/nix/polymc/0001-pick-latest-java-first.patch new file mode 100644 index 000000000..a65dcbfd0 --- /dev/null +++ b/nix/polymc/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?= +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 versions) + + bool sortJavas(BaseVersionPtr left, BaseVersionPtr right) + { +- auto rleft = std::dynamic_pointer_cast(left); +- auto rright = std::dynamic_pointer_cast(right); ++ auto rleft = std::dynamic_pointer_cast(right); ++ auto rright = std::dynamic_pointer_cast(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 JavaUtils::FindJavaPaths() + qDebug() << "Linux Java detection incomplete - defaulting to \"java\""; + + QList javas; +- javas.append(this->GetDefaultJava()->path); + auto scanJavaDir = [&](const QString & dirPath) + { + QDir dir(dirPath); +@@ -379,6 +378,7 @@ QList 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/nix/polymc/default.nix b/nix/polymc/default.nix new file mode 100644 index 000000000..8f69f2740 --- /dev/null +++ b/nix/polymc/default.nix @@ -0,0 +1,47 @@ +{ lib, mkDerivation, fetchFromGitHub, cmake, jdk8, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL, msaClientID ? "" }: + +let + libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio libGL ]; +in +mkDerivation rec { + pname = "polymc"; + version = "1.0.4"; + src = fetchFromGitHub { + owner = "PolyMC"; + repo = "PolyMC"; + rev = "${version}"; + sha256 = "sha256-8aya0KfV9F+i2qBpweWcR9hwyTSQkqn2wHdtkCEeNvk="; + 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 \ + --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 = [ "-DLauncher_LAYOUT=lin-system" ]; + + postInstall = '' + # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 + wrapProgram $out/bin/polymc \ + --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \ + --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]} + ''; + + meta = with lib; { + homepage = "https://github.com/PolyMC/PolyMC"; + description = "A free, open source launcher for Minecraft"; + longDescription = '' + Allows you to have multiple, separate instances of Minecraft (each with their own mods, texture packs, saves, etc) and helps you manage them and their associated options with a simple interface. + ''; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ cidkid ]; + }; +} \ No newline at end of file From 73c0a0d43bdef3cf72c5d19cee5ba553171dea39 Mon Sep 17 00:00:00 2001 From: cidkidnix Date: Sat, 8 Jan 2022 01:34:32 -0600 Subject: [PATCH 2/8] Make nix support not rely on flakes --- flake.nix | 4 +--- overlay.nix | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 overlay.nix diff --git a/flake.nix b/flake.nix index 1d9f8b643..f61da9f2e 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,6 @@ description = "PolyMC"; outputs = inputs: { - overlay = self: super: rec { - polymc = super.libsForQt5.callPackage ./nix/polymc {}; - }; + overlay = import ./overlay.nix; }; } \ No newline at end of file diff --git a/overlay.nix b/overlay.nix new file mode 100644 index 000000000..56e39aa7c --- /dev/null +++ b/overlay.nix @@ -0,0 +1,3 @@ +self: super: rec { + polymc = super.libsForQt5.callPackage ./nix/polymc {}; +} \ No newline at end of file From e8f56d399b2c1f88875912f53acf4b6cae5b7fb8 Mon Sep 17 00:00:00 2001 From: cidkidnix Date: Sat, 8 Jan 2022 01:41:31 -0600 Subject: [PATCH 3/8] Fix desktop file --- nix/polymc/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nix/polymc/default.nix b/nix/polymc/default.nix index 8f69f2740..eedd1615a 100644 --- a/nix/polymc/default.nix +++ b/nix/polymc/default.nix @@ -2,6 +2,11 @@ let libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio libGL ]; + desktopFile = makeDesktopItem { + name = "PolyMC"; + desktopName = "PolyMC"; + exec = "polymc"; + }; in mkDerivation rec { pname = "polymc"; @@ -29,6 +34,7 @@ mkDerivation rec { postInstall = '' # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 + cp ${desktopFile} $out/share/applications/ wrapProgram $out/bin/polymc \ --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \ --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]} From 069d4dd2d1bf7f3438fd7904ec8ac6bc59755593 Mon Sep 17 00:00:00 2001 From: cidkidnix Date: Sat, 8 Jan 2022 01:42:24 -0600 Subject: [PATCH 4/8] Opps forgot something --- nix/polymc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/polymc/default.nix b/nix/polymc/default.nix index eedd1615a..fa356e932 100644 --- a/nix/polymc/default.nix +++ b/nix/polymc/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, jdk8, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL, msaClientID ? "" }: +{ lib, mkDerivation, makeDesktopItem, fetchFromGitHub, cmake, jdk8, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL, msaClientID ? "" }: let libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio libGL ]; From 2a88099094e7c57126827eba2fd6bf9e71d73d25 Mon Sep 17 00:00:00 2001 From: cidkidnix Date: Sat, 8 Jan 2022 01:45:52 -0600 Subject: [PATCH 5/8] fix build --- nix/polymc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/polymc/default.nix b/nix/polymc/default.nix index fa356e932..b8d95bba1 100644 --- a/nix/polymc/default.nix +++ b/nix/polymc/default.nix @@ -34,7 +34,7 @@ mkDerivation rec { postInstall = '' # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 - cp ${desktopFile} $out/share/applications/ + cp ${desktopFile}/share/applications/* $out/share/applications/ wrapProgram $out/bin/polymc \ --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \ --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]} From d68980810a889b0c9858c482746aaeb764db40f8 Mon Sep 17 00:00:00 2001 From: cidkidnix Date: Sat, 8 Jan 2022 01:50:23 -0600 Subject: [PATCH 6/8] make sure we use our desktop file --- nix/polymc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nix/polymc/default.nix b/nix/polymc/default.nix index b8d95bba1..f49c593ab 100644 --- a/nix/polymc/default.nix +++ b/nix/polymc/default.nix @@ -34,6 +34,7 @@ mkDerivation rec { postInstall = '' # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 + rm $out/share/applications/* cp ${desktopFile}/share/applications/* $out/share/applications/ wrapProgram $out/bin/polymc \ --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \ From 8d000d29fa951b3672057541d9944991ac7fe5d0 Mon Sep 17 00:00:00 2001 From: cidkidnix Date: Sat, 8 Jan 2022 09:12:44 -0600 Subject: [PATCH 7/8] Fix desktop file and move directories around --- flake.nix | 4 ++-- overlay.nix => packages/nix/overlay.nix | 0 .../nix}/polymc/0001-pick-latest-java-first.patch | 0 {nix => packages/nix}/polymc/default.nix | 11 +++-------- 4 files changed, 5 insertions(+), 10 deletions(-) rename overlay.nix => packages/nix/overlay.nix (100%) rename {nix => packages/nix}/polymc/0001-pick-latest-java-first.patch (100%) rename {nix => packages/nix}/polymc/default.nix (81%) diff --git a/flake.nix b/flake.nix index f61da9f2e..8f8325c0f 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,6 @@ description = "PolyMC"; outputs = inputs: { - overlay = import ./overlay.nix; + overlay = import ./packages/nix/overlay.nix; }; -} \ No newline at end of file +} diff --git a/overlay.nix b/packages/nix/overlay.nix similarity index 100% rename from overlay.nix rename to packages/nix/overlay.nix diff --git a/nix/polymc/0001-pick-latest-java-first.patch b/packages/nix/polymc/0001-pick-latest-java-first.patch similarity index 100% rename from nix/polymc/0001-pick-latest-java-first.patch rename to packages/nix/polymc/0001-pick-latest-java-first.patch diff --git a/nix/polymc/default.nix b/packages/nix/polymc/default.nix similarity index 81% rename from nix/polymc/default.nix rename to packages/nix/polymc/default.nix index f49c593ab..5f1a0f270 100644 --- a/nix/polymc/default.nix +++ b/packages/nix/polymc/default.nix @@ -1,12 +1,7 @@ -{ lib, mkDerivation, makeDesktopItem, fetchFromGitHub, cmake, jdk8, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL, msaClientID ? "" }: +{ lib, mkDerivation, fetchFromGitHub, cmake, jdk8, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL, msaClientID ? "" }: let libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio libGL ]; - desktopFile = makeDesktopItem { - name = "PolyMC"; - desktopName = "PolyMC"; - exec = "polymc"; - }; in mkDerivation rec { pname = "polymc"; @@ -34,11 +29,11 @@ mkDerivation rec { postInstall = '' # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 - rm $out/share/applications/* - cp ${desktopFile}/share/applications/* $out/share/applications/ wrapProgram $out/bin/polymc \ --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \ --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]} + + substituteInPlace $out/share/applications/org.polymc.PolyMC.desktop --replace 'Exec=' 'Exec=${placeholder "out"}/bin/polymc' ''; meta = with lib; { From 0399fa7d2a1c4e844ff5f5bc5c7e7e4ee7720dcd Mon Sep 17 00:00:00 2001 From: cidkidnix Date: Sat, 8 Jan 2022 09:15:24 -0600 Subject: [PATCH 8/8] Fix wrong path in overlay --- packages/nix/overlay.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nix/overlay.nix b/packages/nix/overlay.nix index 56e39aa7c..5a494459c 100644 --- a/packages/nix/overlay.nix +++ b/packages/nix/overlay.nix @@ -1,3 +1,3 @@ self: super: rec { - polymc = super.libsForQt5.callPackage ./nix/polymc {}; + polymc = super.libsForQt5.callPackage ./polymc {}; } \ No newline at end of file