cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

systemd: add withApparmor option

Browse source
This commit is contained in:
Florian Klink 2020-10-28 01:26:24 +01:00
parent 065f057d0c
commit 93dcbbf69d
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -55,6 +55,7 @@
, bashInteractive , bashInteractive
, withAnalyze ? true , withAnalyze ? true
, withApparmor ? true
, withCoredump ? true , withCoredump ? true
, withCompression ? true # adds bzip2, lz4 and xz , withCompression ? true # adds bzip2, lz4 and xz
, withCryptsetup ? true , withCryptsetup ? true
@ -180,7 +181,6 @@ stdenv.mkDerivation {
audit audit
glib glib
kmod kmod
libapparmor
libcap libcap
libgcrypt libgcrypt
libidn2 libidn2
@ -189,6 +189,7 @@ stdenv.mkDerivation {
pam pam
pcre2 pcre2
] ]
++ lib.optional withApparmor libapparmor
++ lib.optional wantCurl (lib.getDev curl) ++ lib.optional wantCurl (lib.getDev curl)
++ lib.optionals withCompression [ bzip2 lz4 xz ] ++ lib.optionals withCompression [ bzip2 lz4 xz ]
++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev) ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev)

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

@ -18663,6 +18663,7 @@ in
systemdMinimal = systemd.override { systemdMinimal = systemd.override {
pname = "systemd-minimal"; pname = "systemd-minimal";
withAnalyze = false; withAnalyze = false;
withApparmor = false;
withCompression = false; withCompression = false;
withCoredump = false; withCoredump = false;
withCryptsetup = false; withCryptsetup = false;