Migrate android module to new-modules format

- Update usages of android module to use new-modules format
evanjs · Jun 22, 2020 · 6d50920 · 6d50920
1 parent 2ebf646
commit 6d50920
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 17 deletions.
diff --git a/config/machines/rig/default.nix b/config/machines/rig/default.nix
@@ -9,7 +9,6 @@ in
 
     ../../../config
 
-    ../../../modules/android.nix
     ../../../modules/development.nix
 
     # media
@@ -39,6 +38,7 @@ in
   };
 
   nix.distributedBuilds = true;
+  mine.android.enable = true;
   mine.enableUser = true;
   mine.profiles.desktop.enable = true;
   mine.gaming.enable = true;

diff --git a/config/machines/wdesk/default.nix b/config/machines/wdesk/default.nix
@@ -8,7 +8,6 @@
 
     ../../../modules/development.nix
 
-    ../../../modules/android.nix
     ../../../modules/db/postgresql.nix
     ../../../modules/samba/client/work.nix
   ];
@@ -29,6 +28,8 @@
   mine.enableUser = true;
   mine.profiles.desktop.enable = true;
 
+  mind.android.enable = true;
+
   # enable after rocm packages are locked to stable channel
   mine.rocm.enable = false;
 

diff --git a/config/machines/work/default.nix b/config/machines/work/default.nix
@@ -9,7 +9,6 @@
 
     ../../../modules/development.nix
 
-    ../../../modules/android.nix
     ../../../modules/db/postgresql.nix
     ../../../modules/samba/client/work.nix
   ];

diff --git a/config/machines/work/default.nix.bak b/config/machines/work/default.nix.bak
@@ -5,7 +5,6 @@
     ../../new-modules/profiles/desktop.nix
     ./custom-hardware.nix
 
-    ../../../modules/android.nix
     ../../../modules/db/postgresql.nix
     ../../../modules/development.nix
     ../../../modules/linux_latest.nix

diff --git a/modules/android.nix b/modules/android.nix