system-types/android: Nest under `outputs.android`
@@ -21,7 +21,7 @@ let
kernel = "${kernelPackage}/${kernelPackage.file}";
};
- android-recovery = recovery.mobile.outputs.android-bootimg;
+ android-recovery = recovery.mobile.outputs.android.android-bootimg;
inherit (config.mobile.outputs.generatedFilesystems) rootfs;
@@ -159,6 +159,7 @@ in
};
mobile = {
outputs = {
+ android = {
android-bootimg = lib.mkOption {
type = types.package;
description = ''
@@ -180,6 +181,7 @@ in
};
};
};
+ };
config = lib.mkMerge [
{ mobile.system.types = [ "android" ]; }
@@ -187,12 +189,14 @@ in
(lib.mkIf enabled {
mobile.outputs = {
default = android-fastboot-images;
+ android = {
inherit
android-bootimg
android-recovery
android-fastboot-images
;
};
+ };
mobile.HAL.boot.rebootModes = [
"Android.recovery"
