From 342a0d0091fafece11f2b18e38c3786f112ac20b Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 26 Jul 2023 14:47:47 -0400 Subject: fix(nix): disable x86_64-darwin Signed-off-by: seth --- nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nix') 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" ]; } -- cgit From f7ffbcca6c5490e24ee74486cfc6698a38512561 Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 26 Jul 2023 14:45:30 -0400 Subject: chore(docs): correct markdownlint warnings Signed-off-by: seth --- nix/NIX.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'nix') 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 +
+Using channels ```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 +
+ +
+Using the overlay ```nix # In your configuration.nix: @@ -74,6 +78,8 @@ nix-env -iA prismlauncher } ``` +
+ ## Running ad-hoc If you're on a flakes-enabled nix you can run the launcher in one-line -- cgit From 9d5818916af39b32f64e20381a4530efa6247e38 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Fri, 28 Jul 2023 16:09:43 +0200 Subject: fix(nix): enable clang-format Signed-off-by: Sefa Eyeoglu --- nix/dev.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'nix') diff --git a/nix/dev.nix b/nix/dev.nix index 635c6bb4..e42ac5b4 100644 --- a/nix/dev.nix +++ b/nix/dev.nix @@ -19,8 +19,7 @@ nil.enable = true; clang-format = { - enable = - false; # As most of the codebase is **not** formatted, we don't want clang-format yet + enable = true; types_or = ["c" "c++"]; }; }; -- cgit From 076c189948b89787b34a2a4aded7a9c88f580ee1 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 29 Jul 2023 11:30:33 +0200 Subject: fix: format all languages using clang-format Signed-off-by: Sefa Eyeoglu --- nix/dev.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nix') diff --git a/nix/dev.nix b/nix/dev.nix index e42ac5b4..c39e1565 100644 --- a/nix/dev.nix +++ b/nix/dev.nix @@ -20,7 +20,7 @@ clang-format = { enable = true; - types_or = ["c" "c++"]; + types_or = ["c" "c++" "java" "json" "objective-c"]; }; }; }; -- cgit