diff options
author | Florian Klink <flokli@flokli.de> | 2021-07-26 13:12:36 +0200 |
---|---|---|
committer | Florian Klink <flokli@flokli.de> | 2021-07-26 13:16:50 +0200 |
commit | c5f0c9273be61437075c214c14e655f64dedda2c (patch) | |
tree | d320a8716580e2ab4662c633bd152b0b990e371b /pkgs/os-specific/linux | |
parent | 1f42117e032264480729f5061534376e0fbfd0d1 (diff) | |
download | nixpkgs-c5f0c9273be61437075c214c14e655f64dedda2c.tar nixpkgs-c5f0c9273be61437075c214c14e655f64dedda2c.tar.gz nixpkgs-c5f0c9273be61437075c214c14e655f64dedda2c.tar.bz2 nixpkgs-c5f0c9273be61437075c214c14e655f64dedda2c.tar.lz nixpkgs-c5f0c9273be61437075c214c14e655f64dedda2c.tar.xz nixpkgs-c5f0c9273be61437075c214c14e655f64dedda2c.tar.zst nixpkgs-c5f0c9273be61437075c214c14e655f64dedda2c.zip |
systemd: nixpkgs-fmt
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 113 |
1 files changed, 55 insertions, 58 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index a33bb3c1a1d..816952985f5 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -90,7 +90,6 @@ # name argument , pname ? "systemd" - , libxslt , docbook_xsl , docbook_xml_dtd_42 @@ -267,55 +266,53 @@ stdenv.mkDerivation { outputs = [ "out" "man" "dev" ]; - nativeBuildInputs = - [ - pkg-config - gperf - ninja - meson - coreutils # meson calls date, stat etc. - glibcLocales - patchelf - getent - m4 - - intltool - gettext - - libxslt - docbook_xsl - docbook_xml_dtd_42 - docbook_xml_dtd_45 - (buildPackages.python3Packages.python.withPackages (ps: with ps; [ python3Packages.lxml ])) - ]; - - buildInputs = - [ - acl - audit - glib - kmod - libcap - libgcrypt - libidn2 - libuuid - linuxHeaders - pam - ] - - ++ lib.optional withApparmor libapparmor - ++ lib.optional wantCurl (lib.getDev curl) - ++ lib.optionals withCompression [ bzip2 lz4 xz ] - ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev) - ++ lib.optional withEfi gnu-efi - ++ lib.optional withKexectools kexectools - ++ lib.optional withLibseccomp libseccomp - ++ lib.optional withNetworkd iptables - ++ lib.optional withPCRE2 pcre2 - ++ lib.optional withResolved libgpgerror - ++ lib.optional withSelinux libselinux - ++ lib.optional withRemote libmicrohttpd - ++ lib.optionals withHomed [ p11-kit libfido2 ] + nativeBuildInputs = [ + pkg-config + gperf + ninja + meson + coreutils # meson calls date, stat etc. + glibcLocales + patchelf + getent + m4 + + intltool + gettext + + libxslt + docbook_xsl + docbook_xml_dtd_42 + docbook_xml_dtd_45 + (buildPackages.python3Packages.python.withPackages (ps: with ps; [ python3Packages.lxml ])) + ]; + + buildInputs = [ + acl + audit + glib + kmod + libcap + libgcrypt + libidn2 + libuuid + linuxHeaders + pam + ] + + ++ lib.optional withApparmor libapparmor + ++ lib.optional wantCurl (lib.getDev curl) + ++ lib.optionals withCompression [ bzip2 lz4 xz ] + ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev) + ++ lib.optional withEfi gnu-efi + ++ lib.optional withKexectools kexectools + ++ lib.optional withLibseccomp libseccomp + ++ lib.optional withNetworkd iptables + ++ lib.optional withPCRE2 pcre2 + ++ lib.optional withResolved libgpgerror + ++ lib.optional withSelinux libselinux + ++ lib.optional withRemote libmicrohttpd + ++ lib.optionals withHomed [ p11-kit libfido2 ] ; #dontAddPrefix = true; @@ -368,14 +365,14 @@ stdenv.mkDerivation { "-Db_pie=true" "-Dinstall-sysconfdir=false" /* - 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 - should be supported however, see - - https://github.com/systemd/systemd/issues/3855 - - https://github.com/systemd/systemd/issues/4850 - - https://github.com/systemd/systemd/issues/9769 - - https://github.com/systemd/systemd/issues/9843 - - https://github.com/systemd/systemd/issues/10184 + 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 + should be supported however, see + - https://github.com/systemd/systemd/issues/3855 + - https://github.com/systemd/systemd/issues/4850 + - https://github.com/systemd/systemd/issues/9769 + - https://github.com/systemd/systemd/issues/9843 + - https://github.com/systemd/systemd/issues/10184 */ "-Dsystem-uid-max=999" "-Dsystem-gid-max=999" |