From cba38a2f4269e933ddccebca490d5f42f78e00ae Mon Sep 17 00:00:00 2001 From: Peter Woodman Date: Wed, 20 Jan 2021 14:27:30 -0500 Subject: [PATCH] sysklogd: add explainer for musl patch --- pkgs/os-specific/linux/sysklogd/default.nix | 2 +- .../{fix-includes.patch => fix-includes-for-musl.patch} | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) rename pkgs/os-specific/linux/sysklogd/{fix-includes.patch => fix-includes-for-musl.patch} (96%) diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix index 2ee7daca0eb..af180b5e524 100644 --- a/pkgs/os-specific/linux/sysklogd/default.nix +++ b/pkgs/os-specific/linux/sysklogd/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "00f2wy6f0qng7qzga4iicyzl9j8b7mp6mrpfky5jxj93ms2w2rji"; }; - patches = [ ./systemd.patch ./union-wait.patch ./fix-includes.patch ]; + patches = [ ./systemd.patch ./union-wait.patch ./fix-includes-for-musl.patch ]; NIX_CFLAGS_COMPILE = "-DSYSV"; diff --git a/pkgs/os-specific/linux/sysklogd/fix-includes.patch b/pkgs/os-specific/linux/sysklogd/fix-includes-for-musl.patch similarity index 96% rename from pkgs/os-specific/linux/sysklogd/fix-includes.patch rename to pkgs/os-specific/linux/sysklogd/fix-includes-for-musl.patch index e7dbe431275..87e56a10db8 100644 --- a/pkgs/os-specific/linux/sysklogd/fix-includes.patch +++ b/pkgs/os-specific/linux/sysklogd/fix-includes-for-musl.patch @@ -1,3 +1,5 @@ +# this patch both fixes some include paths as well as removes glibc +# gates around defines that musl-libc also depends on. diff -u sysklogd-1.5.1.orig/klogd.c sysklogd-1.5.1/klogd.c --- sysklogd-1.5.1.orig/klogd.c 2014-10-04 15:47:18.000000000 -0400 +++ sysklogd-1.5.1/klogd.c 2021-01-18 23:09:23.000000000 -0500