phone: Only disable systemd-boot on aarch64

This is necessary since the boot process is handled by mobile-nixos.

Note that the implementation here should allow us to move aarch64
differences out of the flake.nix and simplify nixosConfigurations
again long-term.
This commit is contained in:
Donovan Glover 2024-07-18 17:49:55 -04:00
parent d092c5f416
commit 7fe0596d90
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
2 changed files with 3 additions and 7 deletions

View File

@ -75,11 +75,7 @@
mobile-nixos-vm = nixosSystem { mobile-nixos-vm = nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = attrs // { nix-config = self; }; specialArgs = attrs // { nix-config = self; };
modules = phoneModules ++ [ modules = phoneModules;
{
boot.loader.systemd-boot.enable = true;
}
];
}; };
}; };

View File

@ -1,7 +1,7 @@
{ self, pkgs, config, lib, ... }: { self, pkgs, config, lib, ... }:
let let
inherit (lib) mkForce; inherit (lib) mkIf mkForce;
inherit (lib.gvariant) mkTuple; inherit (lib.gvariant) mkTuple;
inherit (config.modules.system) username; inherit (config.modules.system) username;
inherit (builtins) attrValues; inherit (builtins) attrValues;
@ -180,7 +180,7 @@ in
enableContainers = false; enableContainers = false;
binfmt.emulatedSystems = mkForce [ ]; binfmt.emulatedSystems = mkForce [ ];
loader.systemd-boot.enable = mkForce false; loader.systemd-boot.enable = mkIf (pkgs.system == "aarch64-linux") (mkForce false);
}; };
documentation.man.generateCaches = false; documentation.man.generateCaches = false;