diff options
| -rw-r--r-- | pkgs/os-specific/linux/sysklogd/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/sysklogd/union-wait.patch | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix index c1cf77e63c8e..513503ff98e6 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 ]; + patches = [ ./systemd.patch ./union-wait.patch ]; NIX_CFLAGS_COMPILE = "-DSYSV"; diff --git a/pkgs/os-specific/linux/sysklogd/union-wait.patch b/pkgs/os-specific/linux/sysklogd/union-wait.patch new file mode 100644 index 000000000000..e4bffa5d6953 --- /dev/null +++ b/pkgs/os-specific/linux/sysklogd/union-wait.patch @@ -0,0 +1,11 @@ +--- sysklogd-1.5-old/syslogd.c 2016-08-30 22:50:59.812926945 +0100 ++++ sysklogd-1.5/syslogd.c 2016-08-30 22:51:12.008842890 +0100 +@@ -2094,7 +2094,7 @@ + (void) signal(SIGCHLD, reapchild); /* reset signal handler -ASP */ + wait ((int *)0); + #else +- union wait status; ++ int status; + + while (wait3(&status, WNOHANG, (struct rusage *) NULL) > 0) + ; |