Merge pull request #1446 from getchoo/nix-fixes
disable darwin in flake + cleanup garnix.yaml + fix markdownlint warnings
This commit is contained in:
commit
928e18b66d
@ -19,7 +19,7 @@ In an effort to ensure that the code you contribute is actually compatible with
|
||||
|
||||
This can be done by appending `-s` to your `git commit` call, or by manually appending the following text to your commit message:
|
||||
|
||||
```
|
||||
```text
|
||||
<commit message>
|
||||
|
||||
Signed-off-by: Author name <Author email>
|
||||
@ -27,7 +27,7 @@ Signed-off-by: Author name <Author email>
|
||||
|
||||
By signing off your work, you agree to the terms below:
|
||||
|
||||
```
|
||||
```text
|
||||
Developer's Certificate of Origin 1.1
|
||||
|
||||
By making a contribution to this project, I certify that:
|
||||
@ -62,7 +62,6 @@ As a bonus, you can also [cryptographically sign your commits][gh-signing-commit
|
||||
[gh-signing-commits]: https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits
|
||||
[gh-vigilant-mode]: https://docs.github.com/en/authentication/managing-commit-signature-verification/displaying-verification-statuses-for-all-of-your-commits
|
||||
|
||||
|
||||
## Backporting to Release Branches
|
||||
|
||||
We use [automated backports](https://github.com/PrismLauncher/PrismLauncher/blob/develop/.github/workflows/backport.yml) to merge specific contributions from develop into `release` branches.
|
||||
|
@ -1,5 +1,6 @@
|
||||
builds:
|
||||
exclude: []
|
||||
include:
|
||||
- "devShells.*-linux.*"
|
||||
- "packages.*-linux.*"
|
||||
- "checks.x86_64-linux.*"
|
||||
- "devShells.*.*"
|
||||
- "packages.*.*"
|
||||
|
@ -61,7 +61,7 @@ The `standard` and `legacy` launchers are available.
|
||||
|
||||
Example (some parts have been censored):
|
||||
|
||||
```
|
||||
```text
|
||||
mod legacyjavafixer-1.0
|
||||
mainClass net.minecraft.launchwrapper.Launch
|
||||
param --username
|
||||
|
10
nix/NIX.md
10
nix/NIX.md
@ -53,7 +53,8 @@ home.packages = [ pkgs.prismlauncher ];
|
||||
|
||||
### Without flakes-enabled nix
|
||||
|
||||
#### Using channels
|
||||
<details>
|
||||
<summary>Using channels</summary>
|
||||
|
||||
```sh
|
||||
nix-channel --add https://github.com/PrismLauncher/PrismLauncher/archive/master.tar.gz prismlauncher
|
||||
@ -61,7 +62,10 @@ nix-channel --update prismlauncher
|
||||
nix-env -iA prismlauncher
|
||||
```
|
||||
|
||||
#### Using the overlay
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary>Using the overlay</summary>
|
||||
|
||||
```nix
|
||||
# In your configuration.nix:
|
||||
@ -74,6 +78,8 @@ nix-env -iA prismlauncher
|
||||
}
|
||||
```
|
||||
|
||||
</details>
|
||||
|
||||
## Running ad-hoc
|
||||
|
||||
If you're on a flakes-enabled nix you can run the launcher in one-line
|
||||
|
@ -24,9 +24,9 @@
|
||||
# Supported systems.
|
||||
systems = [
|
||||
"x86_64-linux"
|
||||
"x86_64-darwin"
|
||||
"aarch64-linux"
|
||||
# Disabled due to qtbase being currently broken for "aarch64-darwin."
|
||||
# Disabled due to our packages not supporting darwin yet.
|
||||
# "x86_64-darwin"
|
||||
# "aarch64-darwin"
|
||||
];
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user