From b00bfb0401347637e512ef56acb4e34c266209b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Mass=C3=A9?= <masgui@gmail.com>
Date: Sun, 19 Mar 2017 17:15:21 -0400
Subject: [PATCH 1/2] cre2: init at 0.3.0

c wrapper for google's re2 regex library
---
 pkgs/development/libraries/cre2/default.nix | 39 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/libraries/cre2/default.nix

diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/development/libraries/cre2/default.nix
new file mode 100644
index 000000000000..c1fe4686ce23
--- /dev/null
+++ b/pkgs/development/libraries/cre2/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, autoconf, automake,
+  libtool, pkgconfig, re2, texinfo }:
+
+stdenv.mkDerivation rec {
+  name = "cre2-${version}";
+
+  version = "0.3.0";
+    
+  src = fetchFromGitHub {
+    owner = "marcomaggi";
+    repo = "cre2";
+    rev = version;
+    sha256 = "12yrdad87jjqrhbqm02hzsayan2402vf61a9x1b2iabv6d1c1bnj";
+  };
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+    libtool
+    pkgconfig
+    re2
+    texinfo
+  ];
+
+  NIX_LDFLAGS="-lre2 -lpthread";
+
+  preConfigure = "sh autogen.sh";
+  
+  configureFlags = [
+    "--enable-maintainer-mode"
+  ];
+
+  meta = {
+    homepage = http://marcomaggi.github.io/docs/cre2.html;
+    description = "C Wrapper for RE2";
+    license = stdenv.lib.licenses.bsd3;
+    platforms = with stdenv.lib.platforms; all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2e5fe27b14a..85df2db26826 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7195,6 +7195,8 @@ with pkgs;
 
   cracklib = callPackage ../development/libraries/cracklib { };
 
+  cre2 = callPackage ../development/libraries/cre2 { };
+
   cryptopp = callPackage ../development/libraries/crypto++ { };
 
   curlcpp = callPackage ../development/libraries/curlcpp { };

From 3ac089757a76008f75b563a0014bd94a9afbe6d4 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 19 Mar 2017 16:50:06 -0500
Subject: [PATCH 2/2] 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;
   };
 }