From 79cc2754ca30f15d79d5fe77c4141197e41177c9 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 1 Nov 2014 13:44:48 -0700 Subject: [PATCH] syslog-ng-incubator: Refactor --- .../system/syslog-ng-incubator/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index 34a0f15ec1d..73d1f8fdff6 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, glib, syslogng -, eventlog, perl, python, yacc, riemann_c_client, libivykis, protobufc }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, syslogng +, eventlog, perl, python, yacc, riemann_c_client, libivykis, protobufc +}: stdenv.mkDerivation rec { name = "syslog-ng-incubator-${version}"; - version = "0.3.3"; - src = fetchurl { - url = "https://github.com/balabit/syslog-ng-incubator/archive/${name}.tar.gz"; - sha256 = "1yx2gdq1vhrcp113hxgl66z5df4ya9nznvq00nvy4v9yn8wf9fb8"; + src = fetchFromGitHub { + owner = "balabit"; + repo = "syslog-ng-incubator"; + rev = name; + sha256 = "0pswajcw9f651c1jmprbf1mlr6qadiaplyygz5j16vj0d23x4mal"; }; buildInputs = [ - autoconf automake libtool pkgconfig glib syslogng eventlog perl python + autoreconfHook pkgconfig glib syslogng eventlog perl python yacc riemann_c_client libivykis protobufc ]; - preConfigure = "autoreconf -i"; - configureFlags = [ "--without-ivykis" "--with-riemann"