Merge pull request #31 from muscaln/flake
This commit is contained in:
swirl
GitHub
commit
42eb011e3f
2
.gitignore
vendored
2
.gitignore
vendored
@ -48,3 +48,5 @@ builddir
|
|||||||
packages/debian/polymc/usr/
|
packages/debian/polymc/usr/
|
||||||
packages/debian/polymc.deb
|
packages/debian/polymc.deb
|
||||||
packages/debian/polymc/DEBIAN/control
|
packages/debian/polymc/DEBIAN/control
|
||||||
|
# Nix/NixOS
|
||||||
|
result/
|
||||||
|
|||||||
77
flake.lock
generated
Normal file
77
flake.lock
generated
Normal file
@ -0,0 +1,77 @@
|
|||||||
|
{
|
||||||
|
"nodes": {
|
||||||
|
"flake-utils": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1638122382,
|
||||||
|
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"libnbtplusplus": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1591558203,
|
||||||
|
"narHash": "sha256-QgvNvaoFflCXEPCCFBCeZvYTpuiwScBG7EosUgFwFNQ=",
|
||||||
|
"owner": "multimc",
|
||||||
|
"repo": "libnbtplusplus",
|
||||||
|
"rev": "dc72a20b7efd304d12af2025223fad07b4b78464",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "multimc",
|
||||||
|
"repo": "libnbtplusplus",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1641528457,
|
||||||
|
"narHash": "sha256-FyU9E63n1W7Ql4pMnhW2/rO9OftWZ37pLppn/c1aisY=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "ff377a78794d412a35245e05428c8f95fef3951f",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"quazip": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1633895098,
|
||||||
|
"narHash": "sha256-+Of0M2IAoTf1CyC0teCpsyurv6xfqiBo84V49dSeNTA=",
|
||||||
|
"owner": "multimc",
|
||||||
|
"repo": "quazip",
|
||||||
|
"rev": "b1a72ac0bb5a732bf887a535ab75c6f9bedb6b6b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "multimc",
|
||||||
|
"repo": "quazip",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils",
|
||||||
|
"libnbtplusplus": "libnbtplusplus",
|
||||||
|
"nixpkgs": "nixpkgs",
|
||||||
|
"quazip": "quazip"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": "root",
|
||||||
|
"version": 7
|
||||||
|
}
|
||||||
51
flake.nix
51
flake.nix
@ -1,7 +1,50 @@
|
|||||||
{
|
{
|
||||||
description = "PolyMC";
|
description = "PolyMC flake";
|
||||||
|
inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
outputs = inputs: {
|
inputs.flake-utils.url = "github:numtide/flake-utils";
|
||||||
overlay = import ./packages/nix/overlay.nix;
|
inputs.libnbtplusplus = {
|
||||||
|
url = "github:multimc/libnbtplusplus";
|
||||||
|
flake = false;
|
||||||
};
|
};
|
||||||
|
inputs.quazip = {
|
||||||
|
url = "github:multimc/quazip";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
outputs = inputs@{ self, nixpkgs, flake-utils, libnbtplusplus, quazip, ... }:
|
||||||
|
flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ] (system:
|
||||||
|
let
|
||||||
|
pkgs = import nixpkgs {
|
||||||
|
inherit system;
|
||||||
|
};
|
||||||
|
|
||||||
|
packages = {
|
||||||
|
polymc = pkgs.libsForQt5.callPackage ./packages/nix/polymc {
|
||||||
|
inherit self;
|
||||||
|
submoduleQuazip = quazip;
|
||||||
|
submoduleNbt = libnbtplusplus;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
overlay = (final: prev: rec {
|
||||||
|
polymc = prev.libsForQt5.callPackage ./packages/nix/polymc {
|
||||||
|
inherit self;
|
||||||
|
submoduleQuazip = quazip;
|
||||||
|
submoduleNbt = libnbtplusplus;
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
apps = {
|
||||||
|
polymc = flake-utils.lib.mkApp {
|
||||||
|
name = "polymc";
|
||||||
|
drv = packages.polymc;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
inherit packages overlay apps;
|
||||||
|
defaultPackage = packages.polymc;
|
||||||
|
defaultApp = apps.polymc;
|
||||||
|
}
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,3 +0,0 @@
|
|||||||
self: super: rec {
|
|
||||||
polymc = super.libsForQt5.callPackage ./polymc {};
|
|
||||||
}
|
|
||||||
@ -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
|
|
||||||
|
|
||||||
@ -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
|
let
|
||||||
libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio libGL ];
|
gameLibraryPath = with xorg; lib.makeLibraryPath [
|
||||||
|
libX11
|
||||||
|
libXext
|
||||||
|
libXcursor
|
||||||
|
libXrandr
|
||||||
|
libXxf86vm
|
||||||
|
libpulseaudio
|
||||||
|
libGL
|
||||||
|
];
|
||||||
in
|
in
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "polymc";
|
pname = "polymc";
|
||||||
version = "1.0.4";
|
version = "nightly";
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "PolyMC";
|
src = lib.cleanSource self;
|
||||||
repo = "PolyMC";
|
|
||||||
rev = "${version}";
|
nativeBuildInputs = [ cmake ninja file makeWrapper ];
|
||||||
sha256 = "sha256-8aya0KfV9F+i2qBpweWcR9hwyTSQkqn2wHdtkCEeNvk=";
|
|
||||||
fetchSubmodules = true;
|
|
||||||
};
|
|
||||||
nativeBuildInputs = [ cmake file makeWrapper ];
|
|
||||||
buildInputs = [ qtbase jdk8 zlib ];
|
buildInputs = [ qtbase jdk8 zlib ];
|
||||||
|
|
||||||
patches = [ ./0001-pick-latest-java-first.patch ];
|
postUnpack = ''
|
||||||
|
rm -rf source/libraries/{libnbtplusplus,quazip}
|
||||||
postPatch = ''
|
mkdir source/libraries/{libnbtplusplus,quazip}
|
||||||
# hardcode jdk paths
|
cp -a ${submoduleNbt}/* source/libraries/libnbtplusplus
|
||||||
substituteInPlace launcher/java/JavaUtils.cpp \
|
cp -a ${submoduleQuazip}/* source/libraries/quazip
|
||||||
--replace 'scanJavaDir("/usr/lib/jvm")' 'javas.append("${jdk}/lib/openjdk/bin/java")' \
|
chmod a+r+w source/libraries/{libnbtplusplus,quazip}/*
|
||||||
--replace 'scanJavaDir("/usr/lib32/jvm")' 'javas.append("${jdk8}/lib/openjdk/bin/java")'
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
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 = ''
|
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
|
# xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
|
||||||
wrapProgram $out/bin/polymc \
|
wrapProgram $out/bin/polymc \
|
||||||
--set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \
|
--set GAME_LIBRARY_PATH /run/opengl-driver/lib:${gameLibraryPath} \
|
||||||
--prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]}
|
--prefix PATH : ${lib.makeBinPath [ xorg.xrandr jdk ]}
|
||||||
|
|
||||||
substituteInPlace $out/share/applications/org.polymc.PolyMC.desktop --replace 'Exec=' 'Exec=${placeholder "out"}/bin/polymc'
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
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 ];
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue
Block a user