diff options
| author | Florian Klink <flokli@flokli.de> | 2020-07-31 18:38:07 +0200 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2020-07-31 18:38:07 +0200 |
| commit | ae896e090efca856718a979041dd07dbc7ff2109 (patch) | |
| tree | 5a5b6f5743cbba5759f15fa223368273e2fe6125 /pkgs/os-specific/linux/systemd | |
| parent | 33d26f2abb59aa9bf5bb84ec84273a69fe76ec46 (diff) | |
| download | nixpkgs-ae896e090efca856718a979041dd07dbc7ff2109.tar nixpkgs-ae896e090efca856718a979041dd07dbc7ff2109.tar.gz nixpkgs-ae896e090efca856718a979041dd07dbc7ff2109.tar.bz2 nixpkgs-ae896e090efca856718a979041dd07dbc7ff2109.tar.lz nixpkgs-ae896e090efca856718a979041dd07dbc7ff2109.tar.xz nixpkgs-ae896e090efca856718a979041dd07dbc7ff2109.tar.zst nixpkgs-ae896e090efca856718a979041dd07dbc7ff2109.zip | |
systemd: disable remote support
This disabled systemd-journal-upload and systemd-journal-remote. We didn't install the unit files anyways, so this was probably not used at all, and currently fails to build due to libmicrohttpd and systemd code being incompatible: ``` ../src/journal-remote/journal-remote-main.c: In function ‘setup_microhttpd_server’: ../src/journal-remote/journal-remote-main.c:431:38: error: passing argument 5 of ‘MHD_start_daemon’ from incompatible pointer type [-Werror=incompatible-pointer-types] ```
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index cda9c9c066a..a76156a985c 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap , curl, kmod, gnupg, gnutar, xz, pam, acl, libuuid, m4, utillinux, libffi , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor -, audit, lz4, bzip2, libmicrohttpd, pcre2 +, audit, lz4, bzip2, pcre2 , linuxHeaders ? stdenv.cc.libc.linuxHeaders , iptables, gnu-efi, bashInteractive , gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 @@ -90,7 +90,7 @@ in stdenv.mkDerivation { buildInputs = [ linuxHeaders libcap curl.dev kmod xz pam acl /* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2 - libmicrohttpd pcre2 ] ++ + pcre2 ] ++ stdenv.lib.optional withKexectools kexectools ++ stdenv.lib.optional withLibseccomp libseccomp ++ [ libffi audit lz4 bzip2 libapparmor @@ -120,6 +120,7 @@ in stdenv.mkDerivation { "-Dhostnamed=true" "-Dnetworkd=true" "-Dportabled=false" + "-Dremote=false" "-Dsysusers=false" "-Dtimedated=true" "-Dtimesyncd=true" |