Merge branch 'production' into next

2026-01-12 04:39:23 +08:00 · 2024-11-04 22:47:11 +08:00
parent deac145bde 25e4bc244d
commit 7d9284e07d
2 changed files with 2 additions and 1 deletions
--- a/modules/packages/desktop/default.nix
+++ b/modules/packages/desktop/default.nix
@@ -43,7 +43,7 @@ inputs:
          warp-terminal
          # development
          adb-sync scrcpy dbeaver-bin cling aircrack-ng
-          weston cage openbox krita jetbrains.clion android-studio fprettify
+          weston cage openbox krita jetbrains.clion androidStdioPackages.stable.full fprettify
          # desktop sharing
          rustdesk-flutter
          # password and key management
--- a/modules/system/nixpkgs.nix
+++ b/modules/system/nixpkgs.nix
@@ -43,6 +43,7 @@ inputs:
            inherit allowInsecurePredicate;
            allowUnfree = true;
            qchem-config = { optArch = nixpkgs.march; useCuda = nixpkgs.cuda.enable; };
+            android_sdk.accept_license = true;
          }
          // (if nixpkgs.march == null then {} else
          {