Commit Graph

100 Commits

Author SHA1 Message Date
Evan Goode
7dbaa896a6 Merge tag '9.0' into develop
This is an intermediate/halfway commit, more refactoring is needed to
get this to build.
2024-10-25 15:34:57 -04:00
seth
522d105dbe
fix(nix): enable checks
Signed-off-by: seth <getchoo@tuta.io>
2024-10-19 12:32:36 -04:00
seth
988ef32019
fix(nix): don't write to files in formatting check
Signed-off-by: seth <getchoo@tuta.io>
2024-09-30 16:32:50 -04:00
seth
bf432b5514
chore(nix): use cachix for binary cache
Signed-off-by: seth <getchoo@tuta.io>
2024-09-30 16:25:58 -04:00
i-can-not-program
0c6eabfd99 fix(nix): make java paths work again
Signed-off-by: i-can-not-program <alge-@tuta.io>
2024-09-08 22:12:39 +12:00
seth
a49a58bc45
Revert "refactor(nix): nix-filter -> lib.fileset"
This reverts commit 8312713dc2.

See nix#9428. Path coercion like `"${./.}"` in flakes causes the path to
be copied to the store twice; using the `self` argument works around
this. However, as `lib.fileset` doesn't support using `self`, so we need
to go back to `nix-filter`

Signed-off-by: seth <getchoo@tuta.io>
2024-08-21 04:01:32 -04:00
seth
13eedbb7de
doc(nix): prefer packages output
overlays can cause issues we don't run into upstream, especially when
used on stable channels for example. preferring the pure `packages`
output also encourages the use of our binary cache by users, who
probably don't like building the launcher all too much

Signed-off-by: seth <getchoo@tuta.io>
2024-08-21 04:01:32 -04:00
seth
e29ea4efb0
build(nix): add formatting checks
Signed-off-by: seth <getchoo@tuta.io>
2024-08-21 04:01:32 -04:00
seth
0ae421c265
chore(nix): drop flake-parts
The primary goals here include making the flake easier to contribute to
by having it follow the standard boilerplate, while also limiting the
size of our flake.lock to lower the chance of duplicate inputs for users

Signed-off-by: seth <getchoo@tuta.io>
2024-08-21 04:01:30 -04:00
seth
e85b364748
refactor(nix): use final in overlay
this allows to implictly pass `prismlauncher-unwrapped`
it won't have an effect on our package set as directly inheriting from
the scope we create filters out the extra attributes usually introduced
with a scope

Signed-off-by: seth <getchoo@tuta.io>
2024-08-21 03:49:37 -04:00
seth
271c38bc56
doc(nix): update package names and params
Signed-off-by: seth <getchoo@tuta.io>
2024-08-21 03:49:36 -04:00
seth
7a83d0cea0
ci(nix): drop pre-commit-hooks
Signed-off-by: seth <getchoo@tuta.io>
2024-08-21 03:49:36 -04:00
seth
4c81d8c53d
style(nix): format with nixfmt
Signed-off-by: seth <getchoo@tuta.io>
2024-08-21 03:49:36 -04:00
seth
7dff77ca35
style(nix): alejandra -> nixfmt-rfc-style
Signed-off-by: seth <getchoo@tuta.io>
2024-08-21 03:49:36 -04:00
Evan Goode
5345b0b682 nix: sync changes from nixpkgs
Brings in changes from the Prism Launcher derivation(s) in nixpkgs, notably
from https://github.com/NixOS/nixpkgs/pull/321851 and
https://github.com/NixOS/nixpkgs/pull/303880

Signed-off-by: Evan Goode <mail@evangoo.de>
2024-08-11 22:05:44 -04:00
Evan Goode
ff31e88cf8 nix: sync changes from nixpkgs
Brings in changes from the Prism Launcher derivation(s) in nixpkgs, notably
from https://github.com/NixOS/nixpkgs/pull/321851 and
https://github.com/NixOS/nixpkgs/pull/303880

Signed-off-by: Evan Goode <mail@evangoo.de>
2024-07-21 15:47:38 -04:00
Trial97
147741e616
increment clang-tools version
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-28 12:48:52 +03:00
Trial97
97147f2d24
fix(nix): drop unsupported Qt 5 package
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-18 22:31:41 +03:00
Evan Goode
d19074302c Update nix/README.md 2024-05-20 11:06:23 -04:00
Lukas Eschbacher
201c4d2cc6 nix: replace mesa-demos with glxinfo
Signed-off-by: Lukas Eschbacher <eschbacher.lukas@gmail.com>
2024-05-20 14:39:24 +02:00
Evan Goode
2778fe760b Use $FJORDLAUNCHER_JAVA_PATHS 2024-05-16 21:55:48 -04:00
Trial97
78804b26ee
Maybe fix nix
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-17 00:34:39 +03:00
Evan Goode
920731eefd CI: rename PollyMC to Fjord Launcher 2024-05-08 01:00:39 -04:00
Evan Goode
cb2f9b4e14 Crude s/PollyMC/Fjord Launcher 2024-05-04 00:08:42 -04:00
Evan Goode
c8265567aa Merge tag '8.3' into develop 2024-05-03 19:21:17 -04:00
Sefa Eyeoglu
0a3b85dbc5 fix(nix): add jdk21
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 0d372d2fbf)
2024-04-04 17:38:47 +00:00
Sefa Eyeoglu
0d372d2fbf
fix(nix): add jdk21
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2024-04-03 21:04:26 +02:00
Evan Goode
96b4933326 Merge Prism Launcher 8.2
Signed-off-by: Evan Goode <mail@evangoo.de>
2024-03-21 10:59:32 -04:00
seth
8312713dc2
refactor(nix): nix-filter -> lib.fileset
with our own use of `map`, this is basically a drop-in replacement for
nix-filter, but already in nixpkgs!

Signed-off-by: seth <getchoo@tuta.io>
2024-01-23 16:10:41 -05:00
seth
7d9b95b4ce
nix: add garnix cache to nixConfig
Signed-off-by: seth <getchoo@tuta.io>
(cherry picked from commit 839adfc90b)
2024-01-11 09:51:53 +01:00
seth
839adfc90b
nix: add garnix cache to nixConfig
Signed-off-by: seth <getchoo@tuta.io>
2024-01-11 03:20:20 -05:00
Evan Goode
9430026192 Merge tag '8.0' into unmojang-8.0
Upstream changelog: https://github.com/PrismLauncher/PrismLauncher/releases/tag/8.0

(Imcomplete) list of changes in 8.0 relevant to PollyMC:
- Prism has dropped support for Mojang accounts
  - https://github.com/PrismLauncher/PrismLauncher/pull/1656
  - Added it back to PollyMC primarily since the Mojang authentication
    code is also used for authlib-injector accounts. Some users may also
    still want to be able to log in to Mojang accounts for some reason:
    https://github.com/fn2006/PollyMC/issues/115#issuecomment-1805384658,
    even if they do not provide authentication to multiplayer servers.
  - To my surprise, I could still log in to a Mojang account, get its
    skin, and launch the game. Authentication to servers, of course, did
    not work.
  - Tested: logging into authlib-injector, Mojang, and MSA accounts and
    launching the game.
- Prism has added a built-in updater for Windows and Linux that I assume
  provides similar functionality to Sparkle on macOS:
  https://github.com/PrismLauncher/PrismLauncher/pull/1268. There is a
  Launcher_UPDATER_GITHUB_REPO variable in CMakeLists.txt that specifies
  the repo checked by the updater. I have changed this to the PollyMC
  repository, and since PollyMC follows almost the same CI/release
  patterns as Prism Launcher, it might work with PollyMC, too, but I
  have not tested it yet.
- Add macOS support to Nix
  - https://github.com/PrismLauncher/PrismLauncher/pull/1485
  - Untested
- The "PollyMC-Linux-8.0.tar.gz" and similar build artifacts were
  renamed to "PollyMC-Linux-8.0-Qt5.tar.gz" to match their
  "PollyMC-Linux-8.0-Qt6.tar.gz" counterparts.
- Removed Windows MSVC Legacy builds
- Removed Quilt Beacon toggle, the beacon is now always disabled:
  https://github.com/PrismLauncher/PrismLauncher/pull/1547,
  https://github.com/PrismLauncher/meta/pull/23
- Prism removed FTB support in 7.0, but I tested creating an FTB
  instance to make sure it still works in 8.0

Signed-off-by: Evan Goode <mail@evangoo.de>
2023-11-15 14:37:14 -05:00
seth
84269f9596
refactor(nix): use addOpenGLRunpath.driverLink in wrapper
Signed-off-by: seth <getchoo@tuta.io>
2023-09-30 12:50:26 -04:00
seth
97da8892b9
chore(nix): add meta.mainProgram attribute
Signed-off-by: seth <getchoo@tuta.io>
2023-09-19 16:41:40 -04:00
seth
97ced1f459
fix(nix): include libusb1 as a runtime dependency
Signed-off-by: seth <getchoo@tuta.io>
2023-09-19 16:41:37 -04:00
seth
10192c540b
feat(nix): add source filtering
this - along with garnix - should mostly eliminate unneeded (re)builds

Signed-off-by: seth <getchoo@tuta.io>
2023-09-09 15:25:41 -04:00
seth
89e434bd5b
refactor(nix): don't concat final attr in fixed point
Signed-off-by: seth <getchoo@tuta.io>
2023-09-09 15:25:33 -04:00
emanueljg
a9e02ff4d6 fix Nix wrapper using wrong JAVA_PATHS env var 2023-09-06 21:11:56 +02:00
Evan Goode
e47186e0d5 Port over recent Nix packaging changes from Prism Launcher
Resolves https://github.com/fn2006/PollyMC/issues/85

Prism Launcher has refactored a lot of their Nix recently. This includes
the changes from
https://github.com/PrismLauncher/PrismLauncher/pull/1574, but I'm not
100% sure that's what fixed the issue here, it could have been some
other change along the way.

Signed-off-by: Evan Goode <mail@evangoo.de>
2023-09-05 00:22:57 -04:00
Sefa Eyeoglu
2918d61b16
refactor(nix): use pre-commit flake module
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-09-04 08:53:10 +02:00
fn2006
b6904ba50a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-09-04 00:39:20 +01:00
seth
bbf4e3b04d
refactor(nix): use fixed points over rec
Signed-off-by: seth <getchoo@tuta.io>
2023-09-03 19:07:39 -04:00
Sefa Eyeoglu
707da5a25a
fix(nix): include udev dependency
See https://github.com/NixOS/nixpkgs/pull/252425

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-30 21:59:42 +02:00
Sefa Eyeoglu
bdc2fca711
refactor(nix): don't instantiate nixpkgs
See https://zimbatm.com/notes/1000-instances-of-nixpkgs

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-28 15:18:10 +02:00
Sefa Eyeoglu
41bd008f5d
chore(nix): remove pre-commit tools from shell
use `pre-commit` CLI instead!

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-23 13:49:10 +02:00
Sefa Eyeoglu
095de5ed4b
chore(nix): update clang-format to clang-tools 16
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-23 13:46:04 +02:00
Sefa Eyeoglu
b93cd88292
fix(nix): add canonicalize-jars-hook
See https://github.com/NixOS/nixpkgs/pull/250757

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-23 11:52:32 +02:00
Sefa Eyeoglu
5c95448f1f
Merge pull request #1485 from getchoo/nix-darwin 2023-08-20 21:20:09 +02:00
Sefa Eyeoglu
0c753619a4
Merge pull request #1467 from Scrumplex/update-nix-docs 2023-08-15 10:36:38 +02:00
seth
eeb5fdbc9f
feat(nix): add darwin support
Signed-off-by: seth <getchoo@tuta.io>
2023-08-06 15:52:32 -04:00