From 3ac089757a76008f75b563a0014bd94a9afbe6d4 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 19 Mar 2017 16:50:06 -0500 Subject: [PATCH] Cosmetic change; Replaced automake autoconf --- pkgs/development/libraries/cre2/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/development/libraries/cre2/default.nix index c1fe4686ce23..74619cbaaaed 100644 --- a/pkgs/development/libraries/cre2/default.nix +++ b/pkgs/development/libraries/cre2/default.nix @@ -1,9 +1,8 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, +{ stdenv, fetchFromGitHub, autoreconfHook, libtool, pkgconfig, re2, texinfo }: stdenv.mkDerivation rec { name = "cre2-${version}"; - version = "0.3.0"; src = fetchFromGitHub { @@ -14,26 +13,22 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoconf - automake + autoreconfHook libtool pkgconfig - re2 - texinfo ]; + buildInputs = [ re2 texinfo ]; NIX_LDFLAGS="-lre2 -lpthread"; - preConfigure = "sh autogen.sh"; - configureFlags = [ "--enable-maintainer-mode" ]; - meta = { + meta = with stdenv.lib; { homepage = http://marcomaggi.github.io/docs/cre2.html; description = "C Wrapper for RE2"; - license = stdenv.lib.licenses.bsd3; - platforms = with stdenv.lib.platforms; all; + license = licenses.bsd3; + platforms = platforms.all; }; }