systemd: nixpkgs-fmt

This commit is contained in:
Florian Klink 2021-07-26 13:12:36 +02:00
parent 1f42117e03
commit c5f0c9273b

View file

@ -90,7 +90,6 @@
# name argument # name argument
, pname ? "systemd" , pname ? "systemd"
, libxslt , libxslt
, docbook_xsl , docbook_xsl
, docbook_xml_dtd_42 , docbook_xml_dtd_42
@ -267,55 +266,53 @@ stdenv.mkDerivation {
outputs = [ "out" "man" "dev" ]; outputs = [ "out" "man" "dev" ];
nativeBuildInputs = nativeBuildInputs = [
[ pkg-config
pkg-config gperf
gperf ninja
ninja meson
meson coreutils # meson calls date, stat etc.
coreutils # meson calls date, stat etc. glibcLocales
glibcLocales patchelf
patchelf getent
getent m4
m4
intltool intltool
gettext gettext
libxslt libxslt
docbook_xsl docbook_xsl
docbook_xml_dtd_42 docbook_xml_dtd_42
docbook_xml_dtd_45 docbook_xml_dtd_45
(buildPackages.python3Packages.python.withPackages (ps: with ps; [ python3Packages.lxml ])) (buildPackages.python3Packages.python.withPackages (ps: with ps; [ python3Packages.lxml ]))
]; ];
buildInputs = buildInputs = [
[ acl
acl audit
audit glib
glib kmod
kmod libcap
libcap libgcrypt
libgcrypt libidn2
libidn2 libuuid
libuuid linuxHeaders
linuxHeaders pam
pam ]
]
++ 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 ]
++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev) ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev)
++ lib.optional withEfi gnu-efi ++ lib.optional withEfi gnu-efi
++ 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 withPCRE2 pcre2
++ lib.optional withResolved libgpgerror ++ lib.optional withResolved libgpgerror
++ lib.optional withSelinux libselinux ++ lib.optional withSelinux libselinux
++ lib.optional withRemote libmicrohttpd ++ lib.optional withRemote libmicrohttpd
++ lib.optionals withHomed [ p11-kit libfido2 ] ++ lib.optionals withHomed [ p11-kit libfido2 ]
; ;
#dontAddPrefix = true; #dontAddPrefix = true;
@ -368,14 +365,14 @@ stdenv.mkDerivation {
"-Db_pie=true" "-Db_pie=true"
"-Dinstall-sysconfdir=false" "-Dinstall-sysconfdir=false"
/* /*
As of now, systemd doesn't allow runtime configuration of these values. So As of now, systemd doesn't allow runtime configuration of these values. So
the settings in /etc/login.defs have no effect on it. Many people think this the settings in /etc/login.defs have no effect on it. Many people think this
should be supported however, see should be supported however, see
- https://github.com/systemd/systemd/issues/3855 - https://github.com/systemd/systemd/issues/3855
- https://github.com/systemd/systemd/issues/4850 - https://github.com/systemd/systemd/issues/4850
- https://github.com/systemd/systemd/issues/9769 - https://github.com/systemd/systemd/issues/9769
- https://github.com/systemd/systemd/issues/9843 - https://github.com/systemd/systemd/issues/9843
- https://github.com/systemd/systemd/issues/10184 - https://github.com/systemd/systemd/issues/10184
*/ */
"-Dsystem-uid-max=999" "-Dsystem-uid-max=999"
"-Dsystem-gid-max=999" "-Dsystem-gid-max=999"