public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

systemd: add withPCRE2 option

Browse Source
This commit is contained in:
Florian Klink 2020-10-28 01:36:02 +01:00
parent 93dcbbf69d
commit 959cea2e80
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

@ -69,6 +69,7 @@
, withMachined ? true , withMachined ? true
, withNetworkd ? true , withNetworkd ? true
, withNss ? true , withNss ? true
, withPCRE2 ? true
, withPolkit ? true , withPolkit ? true
, withRemote ? false # has always been disabled on NixOS, upstream version appears broken anyway , withRemote ? false # has always been disabled on NixOS, upstream version appears broken anyway
, withResolved ? true , withResolved ? true
@ -187,8 +188,8 @@ stdenv.mkDerivation {
libuuid libuuid
linuxHeaders linuxHeaders
pam pam
pcre2
] ]
++ lib.optional withApparmor libapparmor ++ 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 ]
@ -197,6 +198,7 @@ stdenv.mkDerivation {
++ lib.optional withKexectools kexectools ++ lib.optional withKexectools kexectools
++ lib.optional withLibseccomp libseccomp ++ lib.optional withLibseccomp libseccomp
++ lib.optional withNetworkd iptables ++ lib.optional withNetworkd iptables
++ lib.optional withPCRE2 pcre2
++ lib.optional withResolved libgpgerror ++ lib.optional withResolved libgpgerror
++ lib.optional withSelinux libselinux ++ lib.optional withSelinux libselinux
; ;

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

@ -18677,6 +18677,7 @@ in
withMachined = false; withMachined = false;
withNetworkd = false; withNetworkd = false;
withNss = false; withNss = false;
withPCRE2 = false;
withPolkit = false; withPolkit = false;
withResolved = false; withResolved = false;
withShellCompletions = false; withShellCompletions = false;