From a8df968ac4002c9f41423103af51912b8e8ea3ac Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 23 Dec 2013 17:42:20 +0100
Subject: Upgrade rsyslog to latest stable, 7.4.7. Include systemd journal
 support.

---
 pkgs/tools/system/rsyslog/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'pkgs/tools/system/rsyslog')

diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index c4e955056f4..97020ce2e42 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -1,16 +1,18 @@
-{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls}:
+{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls, libgcrypt, systemd}:
 
 stdenv.mkDerivation {
-  name = "rsyslog-7.2.7";
+  name = "rsyslog-7.4.7";
 
   src = fetchurl {
-    url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.2.7.tar.gz;
-    sha256 = "0vgrbbklsvnwcy0m0kbxcj5lhpn2k9bsv0lh0vnyn6hc2hx56cs8";
+    url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.4.7.tar.gz;
+    sha256 = "5fc7f930fa748bb6a9d86a3fc831eb1a14107db81b67d79ba8f113cf2776fa21";
   };
 
-  buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls];
+  buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls libgcrypt systemd];
 
-  configureFlags = "--enable-gnutls";
+  preConfigure = ''
+     export configureFlags="$configureFlags --enable-gnutls --enable-cached-man-pages --enable-imjournal --with-systemdsystemunitdir=$out/etc/systemd/system"
+  '';
 
   meta = {
     homepage = "http://www.rsyslog.com/";
-- 
cgit 1.4.1