aboutsummaryrefslogtreecommitdiff
path: root/nix
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2023-08-06 21:54:00 +0200
committerSefa Eyeoglu <contact@scrumplex.net>2023-08-06 21:54:00 +0200
commit74fe2fb2a6282a9292cc912b865ce0179dbc3412 (patch)
treed006abece962a65d3538b9b0d8f4e3d264d59eca /nix
parenta83e5be8f2acd66f83ad181e54fe688ed08c1b6f (diff)
parentefaf4024ab22a53a3ef05f0a41b746b7561e087c (diff)
downloadPrismLauncher-74fe2fb2a6282a9292cc912b865ce0179dbc3412.tar.gz
PrismLauncher-74fe2fb2a6282a9292cc912b865ce0179dbc3412.tar.bz2
PrismLauncher-74fe2fb2a6282a9292cc912b865ce0179dbc3412.zip
Merge remote-tracking branch 'upstream/staging' into curseforge-url-handle
Diffstat (limited to 'nix')
-rw-r--r--nix/NIX.md10
-rw-r--r--nix/default.nix4
2 files changed, 10 insertions, 4 deletions
diff --git a/nix/NIX.md b/nix/NIX.md
index 980d20e8..aa945acc 100644
--- a/nix/NIX.md
+++ b/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
diff --git a/nix/default.nix b/nix/default.nix
index 7bad1440..47172927 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -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"
];
}