aboutsummaryrefslogtreecommitdiff
path: root/nix
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-08-05 19:00:12 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-08-05 19:00:12 +0300
commit377fc0352a5b573403d5be0731beb84a77951cf6 (patch)
tree5f85e1d67aefbb859357bd86b1c4f375f5bc3435 /nix
parentc3eb17db74097c49ab3892a53857dfa24937833b (diff)
parent304e294ea701e595b21c0a8a8236ca53828f2b3b (diff)
downloadPrismLauncher-377fc0352a5b573403d5be0731beb84a77951cf6.tar.gz
PrismLauncher-377fc0352a5b573403d5be0731beb84a77951cf6.tar.bz2
PrismLauncher-377fc0352a5b573403d5be0731beb84a77951cf6.zip
Merge branch 'staging' of https://github.com/PrismLauncher/PrismLauncher into icons
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"
];
}