b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

systemd: introduce withBootloader for sd-boot, sd-stub, sd-addon

Browse source 
Instead of relying blindly on `withEfi` which may not always be relevant.
This commit is contained in:
Raito Bezarius 2023-07-28 20:46:45 +02:00 committed by nikstur
parent 202da6443b
commit 1ea060a2b8
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/os-specific/linux/systemd/default.nix
View file

@ -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) [

1
pkgs/top-level/all-packages.nix
View file

@ -29001,6 +29001,7 @@ with pkgs;
withTpm2Tss = false;
withUserDb = false;
withUkify = false;
withBootloader = false;
};
systemdStage1 = systemdMinimal.override {
pname = "systemd-stage-1";