diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-09-03 18:23:45 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-09-03 18:23:45 +0000 |
| commit | 071a7a4583a58b4b1454df4dad85981428a8dfc1 (patch) | |
| tree | 4fc2fc16509ad79c17324d510fef583944270375 /pkgs/os-specific/linux/systemd | |
| parent | ce434a97e239466bf46e35d89d4e5458e8428d94 (diff) | |
| parent | 117b5074bf2d0534d182775b75d2b14aa34d65f3 (diff) | |
| download | nixpkgs-071a7a4583a58b4b1454df4dad85981428a8dfc1.tar nixpkgs-071a7a4583a58b4b1454df4dad85981428a8dfc1.tar.gz nixpkgs-071a7a4583a58b4b1454df4dad85981428a8dfc1.tar.bz2 nixpkgs-071a7a4583a58b4b1454df4dad85981428a8dfc1.tar.lz nixpkgs-071a7a4583a58b4b1454df4dad85981428a8dfc1.tar.xz nixpkgs-071a7a4583a58b4b1454df4dad85981428a8dfc1.tar.zst nixpkgs-071a7a4583a58b4b1454df4dad85981428a8dfc1.zip | |
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index fc4c6c872b4..63f82923cb7 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -52,8 +52,8 @@ , libselinux , withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp , libseccomp -, withKexectools ? lib.meta.availableOn stdenv.hostPlatform kexectools -, kexectools +, withKexectools ? lib.meta.availableOn stdenv.hostPlatform kexec-tools +, kexec-tools , bashInteractive , libmicrohttpd @@ -302,7 +302,7 @@ stdenv.mkDerivation rec { ++ lib.optionals withCompression [ bzip2 lz4 xz ] ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev) ++ lib.optional withEfi gnu-efi - ++ lib.optional withKexectools kexectools + ++ lib.optional withKexectools kexec-tools ++ lib.optional withLibseccomp libseccomp ++ lib.optional withNetworkd iptables ++ lib.optional withPCRE2 pcre2 |