Disable Android Studio

SkymontVibe · Jun 5, 2023 · fff51f0 · fff51f0
1 parent 2aa8ee7
commit fff51f0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -19,7 +19,9 @@ jobs:
       - uses: cachix/install-nix-action@v20
         with:
           nix_path: nixpkgs=channel:nixos-unstable
+      - name: Build dev shell
+        run: nix develop .#noAS
       - name: Build Debug APK
         run: |
-          nix develop --command ./gradlew :app:assembleDebug
-          nix develop --command ./gradlew :assembleDebugPlugins
+          nix develop .#noAS --command ./gradlew :app:assembleDebug
+          nix develop .#noAS --command ./gradlew :assembleDebugPlugins
diff --git a/flake.nix b/flake.nix
@@ -17,9 +17,15 @@
           config.allowUnfree = true;
           overlays = [ self.overlays.default ];
         };
-      in { devShells.default = pkgs.fcitx5-android-shell; }) // {
+      in {
+        devShells = {
+          default = pkgs.fcitx5-android-shell { };
+          noAS = pkgs.fcitx5-android-shell { enableAndroidStudio = false; };
+        };
+      }) // {
         overlays.default = final: prev: {
-          fcitx5-android-shell = with final;
+          fcitx5-android-shell = { enableAndroidStudio ? true }:
+            with final;
             with fcitx5-android-sdk;
             mkShell {
               buildInputs = [
@@ -28,8 +34,10 @@
                 gettext
                 python39
                 icu
-                androidStudioPackages.stable
-              ];
+              ] ++ (if enableAndroidStudio then
+                [ androidStudioPackages.stable ]
+              else
+                [ ]);
               ANDROID_SDK_ROOT =
                 "${androidComposition.androidsdk}/libexec/android-sdk";
               NDK_VERSION = ndkVersion;