diff options
Diffstat (limited to 'nixpkgs/pkgs/os-specific/linux/systemd/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/os-specific/linux/systemd/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/nixpkgs/pkgs/os-specific/linux/systemd/default.nix index f57e4039d203..23f875d2dc46 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/systemd/default.nix @@ -55,6 +55,7 @@ , e2fsprogs , elfutils , linuxHeaders ? stdenv.cc.libc.linuxHeaders +, gnutls , iptables , withSelinux ? false , libselinux @@ -207,6 +208,8 @@ stdenv.mkDerivation (finalAttrs: { ./0017-core-don-t-taint-on-unmerged-usr.patch ./0018-tpm2_context_init-fix-driver-name-checking.patch ./0019-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch + ] ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) [ + ./0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { @@ -436,7 +439,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withPam pam ++ lib.optional withPCRE2 pcre2 ++ lib.optional withSelinux libselinux - ++ lib.optional withRemote libmicrohttpd + ++ lib.optionals withRemote [ libmicrohttpd gnutls ] ++ lib.optionals (withHomed || withCryptsetup) [ p11-kit ] ++ lib.optionals (withHomed || withCryptsetup) [ libfido2 ] ++ lib.optionals withLibBPF [ libbpf ] @@ -773,7 +776,11 @@ stdenv.mkDerivation (finalAttrs: { inherit withCryptsetup withHostnamed withImportd withKmod withLocaled withMachined withPortabled withTimedated withUtmp util-linux kmod kbd; tests = { - inherit (nixosTests) switchTest; + inherit (nixosTests) + switchTest + systemd-journal + systemd-journal-gateway + systemd-journal-upload; cross = pkgsCross.${if stdenv.buildPlatform.isAarch64 then "gnu64" else "aarch64-multiplatform"}.systemd; }; }; |