Merge pull request #1294 from k3yss/work/keys/android-studio-optional

feat: Make android-studio optional
cachix · Jun 24, 2024 · 15e71cb · 15e71cb
2 parents 52b3a67 + eed50e0
commit 15e71cb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/examples/android/devenv.nix b/examples/android/devenv.nix
@@ -2,4 +2,5 @@
 
 {
   android.enable = true;
+  android.android-studio.enable = false;
 }
diff --git a/src/modules/integrations/android.nix b/src/modules/integrations/android.nix
@@ -212,7 +212,9 @@ in
       '';
     };
 
-    android-studio = lib.mkOption {
+    android-studio.enable = lib.mkEnableOption "the installation of Android Studio";
+
+    android-studio.package = lib.mkOption {
       type = lib.types.package;
       default = pkgs.android-studio;
       defaultText = "pkgs.android-studio";
@@ -256,8 +258,7 @@ in
       androidSdk
       platformTools
       androidEmulator
-      cfg.android-studio
-    ] ++ (lib.optional cfg.flutter.enable cfg.flutter.package);
+    ] ++ (lib.optional cfg.flutter.enable cfg.flutter.package) ++ (lib.optional cfg.android-studio.enable cfg.android-studio.package);
 
     # Nested conditional for flutter
     languages = lib.mkMerge [
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,5 @@ @@
     {
       android.enable = true;
+      android.android-studio.enable = false;
     }