public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rsyslog: Move systemd check

Browse Source
This commit is contained in:
Eelco Dolstra 2015-03-16 17:32:41 +01:00
parent 7e285b8b87
commit c1e1092b8b
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/system/rsyslog/default.nix
View File

@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
pkgconfig libestr json_c zlib pythonPackages.docutils 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 libgcrypt liblognorm openssl librelp libgt liblogging libnet hadoop rdkafka
libmongo-client czmq rabbitmq-c hiredis libmongo-client czmq rabbitmq-c hiredis
]; ] ++ stdenv.lib.optional stdenv.isLinux systemd;
configureFlags = [ configureFlags = [
"--sysconfdir=/etc" "--sysconfdir=/etc"

1
pkgs/top-level/all-packages.nix
View File

@ -787,7 +787,6 @@ let
libgcrypt = libgcrypt_1_6; libgcrypt = libgcrypt_1_6;
czmq = null; # Currently Broken czmq = null; # Currently Broken
hadoop = null; # Currently Broken hadoop = null; # Currently Broken
systemd = if stdenv.isLinux then systemd else null;
}; };
rsyslog-light = callPackage ../tools/system/rsyslog { rsyslog-light = callPackage ../tools/system/rsyslog {