diff options
author | Raito Bezarius <masterancpp@gmail.com> | 2023-07-28 20:46:45 +0200 |
---|---|---|
committer | nikstur <nikstur@outlook.com> | 2023-09-13 12:02:40 +0200 |
commit | 1ea060a2b843eb171d371db7e28694fce24f608e (patch) | |
tree | d48cc96f9c90a9643d61c7f13f0995f251e20842 /pkgs | |
parent | 202da6443bdc7c245bbd931efe2becdfafdcd8a8 (diff) | |
download | nixpkgs-1ea060a2b843eb171d371db7e28694fce24f608e.tar nixpkgs-1ea060a2b843eb171d371db7e28694fce24f608e.tar.gz nixpkgs-1ea060a2b843eb171d371db7e28694fce24f608e.tar.bz2 nixpkgs-1ea060a2b843eb171d371db7e28694fce24f608e.tar.lz nixpkgs-1ea060a2b843eb171d371db7e28694fce24f608e.tar.xz nixpkgs-1ea060a2b843eb171d371db7e28694fce24f608e.tar.zst nixpkgs-1ea060a2b843eb171d371db7e28694fce24f608e.zip |
systemd: introduce `withBootloader` for sd-boot, sd-stub, sd-addon
Instead of relying blindly on `withEfi` which may not always be relevant.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 633c98dbb16..d342cbb2a95 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -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) [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbfc1c4662c..95cefc28c90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29001,6 +29001,7 @@ with pkgs; withTpm2Tss = false; withUserDb = false; withUkify = false; + withBootloader = false; }; systemdStage1 = systemdMinimal.override { pname = "systemd-stage-1"; |