aboutsummaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rwxr-xr-xpackages/debian/makedeb.sh10
-rw-r--r--packages/debian/polymc/DEBIAN/control.template9
-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
-rw-r--r--packages/rpm/polymc.spec139
6 files changed, 3 insertions, 228 deletions
diff --git a/packages/debian/makedeb.sh b/packages/debian/makedeb.sh
deleted file mode 100755
index 5a8c71dd..00000000
--- a/packages/debian/makedeb.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-mkdir builddir
-cd builddir
-cmake -DLauncher_LAYOUT=lin-system -DCMAKE_INSTALL_PREFIX=../polymc/usr ../../../
-make -j$(nproc) install
-cd ..
-VERSION_PLACEHOLDER=$(git describe --tags | sed 's/-.*//')
-cp polymc/DEBIAN/control.template polymc/DEBIAN/control
-sed -i "2s/.*/Version: $VERSION_PLACEHOLDER/" polymc/DEBIAN/control
-dpkg-deb --build polymc
diff --git a/packages/debian/polymc/DEBIAN/control.template b/packages/debian/polymc/DEBIAN/control.template
deleted file mode 100644
index f7c294bc..00000000
--- a/packages/debian/polymc/DEBIAN/control.template
+++ /dev/null
@@ -1,9 +0,0 @@
-Package: polymc
-Version:
-Section: games
-Priority: optional
-Architecture: amd64
-Depends: libqt5core5a, libqt5network5, libqt5gui5
-Maintainer: PolyMC Team
-Description: PolyMC
- A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once
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 ]}
'';
}
diff --git a/packages/rpm/polymc.spec b/packages/rpm/polymc.spec
deleted file mode 100644
index f22ba078..00000000
--- a/packages/rpm/polymc.spec
+++ /dev/null
@@ -1,139 +0,0 @@
-
-%global libnbtplusplus_commit dc72a20b7efd304d12af2025223fad07b4b78464
-%global libnbtplusplus_shortcommit %(c=%{libnbtplusplus_commit}; echo ${c:0:7})
-%global quazip_commit c9ef32de19bceb58d236f5c22382698deaec69fd
-%global quazip_shortcommit %(c=%{quazip_commit}; echo ${c:0:7})
-
-Name: polymc
-Version: 1.0.4
-Release: 2%{?dist}
-Summary: Minecraft launcher with ability to manage multiple instances
-
-#
-# CC-BY-SA
-# ---------------------------------------
-# launcher/resources/multimc/
-#
-# BSD 3-clause "New" or "Revised" License
-# ---------------------------------------
-# application/
-# libraries/LocalPeer/
-# libraries/ganalytics/
-#
-# Boost Software License (v1.0)
-# ---------------------------------------
-# cmake/
-#
-# Expat License
-# ---------------------------------------
-# libraries/systeminfo/
-#
-# GNU Lesser General Public License (v2 or later)
-# ---------------------------------------
-# libraries/rainbow
-#
-# GNU Lesser General Public License (v2.1 or later)
-# ---------------------------------------
-# libraries/iconfix/
-# libraries/quazip/
-#
-# GNU Lesser General Public License (v3 or later)
-# ---------------------------------------
-# libraries/libnbtplusplus/
-#
-# GPL (v2)
-# ---------------------------------------
-# libraries/pack200/
-#
-# ISC License
-# ---------------------------------------
-# libraries/hoedown/
-#
-# zlib/libpng license
-# ---------------------------------------
-# libraries/quazip/quazip/unzip.h
-# libraries/quazip/quazip/zip.h
-#
-
-License: CC-BY-SA and ASL 2.0 and BSD and Boost and LGPLv2 and LGPLv2+ and LGPLv3+ and GPLv2 and GPLv2+ and GPLv3 and ISC and zlib
-URL: https://polymc.org
-Source0: https://github.com/PolyMC/PolyMC/archive/%{version}/%{name}-%{version}.tar.gz
-Source1: https://github.com/MultiMC/libnbtplusplus/archive/%{libnbtplusplus_commit}/libnbtplusplus-%{libnbtplusplus_shortcommit}.tar.gz
-Source2: https://github.com/PolyMC/quazip/archive/%{quazip_commit}/quazip-%{quazip_shortcommit}.tar.gz
-
-BuildRequires: cmake3
-BuildRequires: desktop-file-utils
-BuildRequires: gcc-c++
-
-# Fix warning: Could not complete Guile gdb module initialization from:
-# /usr/share/gdb/guile/gdb/boot.scm
-BuildRequires: gdb-headless
-
-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
-PolyMC is a free, open source launcher for Minecraft. It 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.
-
-
-%prep
-%autosetup -p1 -n PolyMC-%{version}
-
-tar -xvf %{SOURCE1} -C libraries
-tar -xvf %{SOURCE2} -C libraries
-rmdir libraries/libnbtplusplus libraries/quazip
-mv -f libraries/quazip-%{quazip_commit} libraries/quazip
-mv -f libraries/libnbtplusplus-%{libnbtplusplus_commit} libraries/libnbtplusplus
-
-
-%build
-%cmake \
- -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
- -DLauncher_LAYOUT:STRING="lin-system" \
- -DLauncher_LIBRARY_DEST_DIR:STRING="%{_libdir}/%{name}" \
- -DLauncher_UPDATER_BASE:STRING=""
-
-%cmake_build
-
-
-%install
-%cmake_install
-
-# Proper library linking
-mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/
-echo "%{_libdir}/%{name}" > "%{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf"
-
-
-%check
-%ctest
-desktop-file-validate %{buildroot}%{_datadir}/applications/org.polymc.PolyMC.desktop
-
-
-%files
-%license COPYING.md
-%doc README.md changelog.md
-%{_bindir}/%{name}
-%{_libdir}/%{name}/*
-%{_datadir}/%{name}/*
-%{_datadir}/metainfo/org.polymc.PolyMC.metainfo.xml
-%{_datadir}/icons/hicolor/scalable/apps/org.polymc.PolyMC.svg
-%{_datadir}/applications/org.polymc.PolyMC.desktop
-%config %{_sysconfdir}/ld.so.conf.d/*
-
-
-%changelog
-* Sun Jan 09 2022 Jan Drögehoff <sentrycraft123@gmail.com> - 1.0.4-2
-- rework spec
-
-* Fri Jan 7 2022 getchoo <getchoo at tuta dot io> - 1.0.4-1
-- Initial polymc spec \ No newline at end of file
generated by cgit (git 2.34.1) at 2026-06-29 16:13:51 +0000