From c1e1092b8b601b2cac96213a482c5b71476ff7d5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 16 Mar 2015 17:32:41 +0100 Subject: rsyslog: Move systemd check --- pkgs/tools/system/rsyslog/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index e253a4ef00e1..2f62ce31949d 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libestr json_c zlib pythonPackages.docutils - krb5 systemd jemalloc mysql postgresql libdbi net_snmp libuuid curl gnutls + krb5 jemalloc mysql postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libgt liblogging libnet hadoop rdkafka libmongo-client czmq rabbitmq-c hiredis - ]; + ] ++ stdenv.lib.optional stdenv.isLinux systemd; configureFlags = [ "--sysconfdir=/etc" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 783f5ea6ad7a..f88a6000d823 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -787,7 +787,6 @@ let libgcrypt = libgcrypt_1_6; czmq = null; # Currently Broken hadoop = null; # Currently Broken - systemd = if stdenv.isLinux then systemd else null; }; rsyslog-light = callPackage ../tools/system/rsyslog { -- cgit 1.4.1