diff options
| author | Alexandru Ionut Tripon <alexandru.tripon97@gmail.com> | 2023-08-12 12:42:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-12 12:42:30 +0300 |
| commit | b3b2e9df35222209b4920202d86091eeeb87f03f (patch) | |
| tree | ce44c3877ee36c21279d142b2af1c393e7b87780 /nix | |
| parent | ca061080c13042642fb3bd49a29a863756f45866 (diff) | |
| parent | 3aba7f8fec45c7c87be486d8f6b5c96f69facf93 (diff) | |
| download | PrismLauncher-b3b2e9df35222209b4920202d86091eeeb87f03f.tar.gz PrismLauncher-b3b2e9df35222209b4920202d86091eeeb87f03f.tar.bz2 PrismLauncher-b3b2e9df35222209b4920202d86091eeeb87f03f.zip | |
Merge branch 'develop' into feat/acknowledge_release_type
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/NIX.md | 10 | ||||
| -rw-r--r-- | nix/default.nix | 4 | ||||
| -rw-r--r-- | nix/dev.nix | 5 |
3 files changed, 12 insertions, 7 deletions
@@ -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" ]; } diff --git a/nix/dev.nix b/nix/dev.nix index 635c6bb4..c39e1565 100644 --- a/nix/dev.nix +++ b/nix/dev.nix @@ -19,9 +19,8 @@ nil.enable = true; clang-format = { - enable = - false; # As most of the codebase is **not** formatted, we don't want clang-format yet - types_or = ["c" "c++"]; + enable = true; + types_or = ["c" "c++" "java" "json" "objective-c"]; }; }; }; |