nixos: fixup build of aarch64 minimal ISO (fixes #109252)

Perhaps it's not pretty nor precise; feel free to improve.
This commit is contained in:
Vladimír Čunát
2021-01-13 14:05:45 +01:00
parent 9534559209
commit 8ca33835ba
4 changed files with 41 additions and 18 deletions
+13 -7
View File
@@ -194,31 +194,37 @@ in
config = mkMerge
[ (mkIf config.boot.initrd.enable {
boot.initrd.availableKernelModules =
[ # Note: most of these (especially the SATA/PATA modules)
boot.initrd.availableKernelModules = let
# Some modules apparently aren't present on our aarch64 (and maybe elsewhere).
maybeInitrdModules = lib.optionals (!pkgs.stdenv.hostPlatform.isAarch64);
in
# Note: most of these (especially the SATA/PATA modules)
# shouldn't be included by default since nixos-generate-config
# detects them, but I'm keeping them for now for backwards
# compatibility.
# Some SATA/PATA stuff.
"ahci"
maybeInitrdModules [ "ahci" ]
++ [
"sata_nv"
"sata_via"
"sata_sis"
"sata_uli"
"ata_piix"
"pata_marvell"
]
# Standard SCSI stuff.
"sd_mod"
"sr_mod"
++ maybeInitrdModules [ "sd_mod" ]
++ [ "sr_mod" ]
# SD cards and internal eMMC drives.
"mmc_block"
++ maybeInitrdModules [ "mmc_block" ]
# Support USB keyboards, in case the boot fails and we only have
# a USB keyboard, or for LUKS passphrase prompt.
"uhci_hcd"
++ [ "uhci_hcd" ]
++ maybeInitrdModules [
"ehci_hcd"
"ehci_pci"
"ohci_hcd"