Merge branch 'develop' into develop

5 files changed, 130 insertions, 87 deletions

diff --git a/packages/nix/overlay.nix b/packages/nix/overlay.nix
deleted file mode 100644
index 5a494459..00000000
--- a/packages/nix/overlay.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-self: super: rec {
-  polymc = super.libsForQt5.callPackage ./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 5f1a0f27..4f80ff34 100644
--- a/packages/nix/polymc/default.nix
+++ b/packages/nix/polymc/default.nix
@@ -1,49 +1,79 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, jdk8, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL, msaClientID ? "" }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, makeDesktopItem
+, substituteAll
+, fetchpatch
+, cmake
+, ninja
+, jdk8
+, jdk
+, zlib
+, file
+, makeWrapper
+, xorg
+, libpulseaudio
+, qtbase
+, libGL
+# submodules
+, self
+, submoduleNbt
+, submoduleQuazip
+}:
 
 let
-  libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio libGL ];
-in 
+  gameLibraryPath = 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 ];
+  version = "nightly";
 
-  patches = [ ./0001-pick-latest-java-first.patch ];
+  src = lib.cleanSource self;
 
-  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")'
+  nativeBuildInputs = [ cmake ninja file makeWrapper ];
+  buildInputs = [ qtbase jdk8 zlib ];
+
+  postUnpack = ''
+    rm -rf source/libraries/{libnbtplusplus,quazip}
+    mkdir source/libraries/{libnbtplusplus,quazip}
+    cp -a ${submoduleNbt}/* source/libraries/libnbtplusplus
+    cp -a ${submoduleQuazip}/* source/libraries/quazip
+    chmod a+r+w source/libraries/{libnbtplusplus,quazip}/*
   '';
 
-  cmakeFlags = [ "-DLauncher_LAYOUT=lin-system" ];
+  cmakeFlags = [
+    "-GNinja"
+    "-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/multimc.svg
+    install -Dm755 ${desktopItem}/share/applications/polymc.desktop -t $out/share/applications
     # 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 ]}
-
-    substituteInPlace $out/share/applications/org.polymc.PolyMC.desktop --replace 'Exec=' 'Exec=${placeholder "out"}/bin/polymc'
+      --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${gameLibraryPath} \
+      --prefix PATH : ${lib.makeBinPath [ xorg.xrandr jdk ]}
   '';
-
-  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
+}
diff --git a/packages/rpm/makerpm.sh b/packages/rpm/makerpm.sh
new file mode 100755
index 00000000..02ecf206
--- /dev/null
+++ b/packages/rpm/makerpm.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+git submodule init
+git submodule update
+VERSION=$(git describe --tags | sed 's/-.*//')
+DIR=$(pwd)
+sed -i "s/Version:.*/Version: ${VERSION}/" polymc.spec
+sudo dnf builddep polymc.spec
+rpmbuild -ba polymc.spec
diff --git a/packages/rpm/polymc.spec b/packages/rpm/polymc.spec
new file mode 100644
index 00000000..3c5ba435
--- /dev/null
+++ b/packages/rpm/polymc.spec
@@ -0,0 +1,55 @@
+%global _origdir %(pwd)
+
+Name: polymc
+Version: 
+Release: 1%{?dist}
+Summary: A custom launcher for Minecraft
+License: GPLv3
+URL: https://polymc.org/
+
+BuildArch: x86_64
+BuildRequires:  java-devel
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(Qt5)
+BuildRequires:  pkgconfig(zlib)
+
+Requires: java-headless
+Requires: pkgconfig(gl)
+Requires: pkgconfig(Qt5)
+Requires: pkgconfig(zlib)
+
+%description
+A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once
+
+%prep
+mkdir -p %{_builddir}/%{name}
+cp -r %{_origdir}/../../* %{_builddir}/%{name}
+
+%build
+cd %{_builddir}/%{name}
+cmake \
+  -DLauncher_LAYOUT=lin-system \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DLauncher_LIBRARY_DEST_DIR=%{_lib} \
+  .
+
+%cmake_build
+
+%install
+cd %{_builddir}/%{name}
+%cmake_install
+
+%files
+%{_bindir}/polymc
+%{_datadir}/applications/org.polymc.PolyMC.desktop
+%{_datadir}/metainfo/org.polymc.PolyMC.metainfo.xml
+%{_datadir}/polymc/jars/*
+%{_datadir}/icons/hicolor/scalable/apps/org.polymc.PolyMC.svg
+%{_libdir}/libLauncher_nbt++.so
+%{_libdir}/libLauncher_quazip.so
+%{_libdir}/libLauncher_rainbow.so
+%{_libdir}/libLauncher_iconfix.so
+
+%changelog
+* Fri Jan 7 2022 getchoo <getchoo at tuta dot io> - 1.0.4
+- Initial polymc spec