mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-04 14:00:04 +00:00
systemd: introduce withBootloader for sd-boot, sd-stub, sd-addon
Instead of relying blindly on `withEfi` which may not always be relevant.
This commit is contained in:
@@ -88,6 +88,7 @@
|
||||
, withAnalyze ? true
|
||||
, withApparmor ? true
|
||||
, withAudit ? true
|
||||
, withBootloader ? true # compiles systemd-boot, assumes EFI is available.
|
||||
, withCompression ? true # adds bzip2, lz4, xz and zstd
|
||||
, withCoredump ? true
|
||||
, withCryptsetup ? true
|
||||
@@ -148,6 +149,7 @@ assert withHomed -> withCryptsetup;
|
||||
assert withHomed -> withPam;
|
||||
assert withUkify -> withEfi;
|
||||
assert withRepart -> withCryptsetup;
|
||||
assert withBootloader -> withEfi;
|
||||
|
||||
let
|
||||
wantCurl = withRemote || withImportd;
|
||||
@@ -534,7 +536,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-Dman=true"
|
||||
|
||||
"-Defi=${lib.boolToString withEfi}"
|
||||
"-Dbootloader=${lib.boolToString withEfi}"
|
||||
"-Dbootloader=${lib.boolToString withBootloader}"
|
||||
|
||||
"-Dukify=${lib.boolToString withUkify}"
|
||||
] ++ lib.optionals (withShellCompletions == false) [
|
||||
|
||||
@@ -29001,6 +29001,7 @@ with pkgs;
|
||||
withTpm2Tss = false;
|
||||
withUserDb = false;
|
||||
withUkify = false;
|
||||
withBootloader = false;
|
||||
};
|
||||
systemdStage1 = systemdMinimal.override {
|
||||
pname = "systemd-stage-1";
|
||||
|
||||
Reference in New Issue
Block a user