From 1c2425ac787a033086ae687cedb4b30e1ad4c341 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 6 Oct 2023 21:27:11 -0400 Subject: [PATCH] systemd: disable bootloader by default if EFI is disabled If EFI is disabled, either because it is not available on the platform or because the user has manually disabled it, automatically disable building systemd-boot. The "withBootloader -> withEfi" assertion is maintained in case someone manually tries to enable the bootloader without EFI support. This fixes evaluation on platforms without EFI support. --- pkgs/os-specific/linux/systemd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 0d38016d9d73..d96a6882d63c 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -88,7 +88,7 @@ , withAnalyze ? true , withApparmor ? true , withAudit ? true -, withBootloader ? !stdenv.hostPlatform.isMusl # compiles systemd-boot, assumes EFI is available. +, withBootloader ? withEfi && !stdenv.hostPlatform.isMusl # compiles systemd-boot, assumes EFI is available. , withCompression ? true # adds bzip2, lz4, xz and zstd , withCoredump ? true , withCryptsetup ? true