From ea80cd1f1101aa9553a6bdb9896e619593948cef Mon Sep 17 00:00:00 2001
From: Thomas Bach <t.bach@ilexius.de>
Date: Wed, 29 Mar 2017 12:27:50 +0200
Subject: [PATCH] haproxy: added fuzzy-id to the list of maintainers

---
 lib/maintainers.nix                       |  1 +
 pkgs/tools/networking/haproxy/default.nix | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e6c44aa81b12..9bc0c2fd5d2d 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -181,6 +181,7 @@
   ftrvxmtrx = "Siarhei Zirukin <ftrvxmtrx@gmail.com>";
   funfunctor = "Edward O'Callaghan <eocallaghan@alterapraxis.com>";
   fuuzetsu = "Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>";
+  fuzzy-id = "Thomas Bach <hacking+nixos@babibo.de>";
   fxfactorial = "Edgar Aroutiounian <edgar.factorial@gmail.com>";
   gal_bolle = "Florent Becker <florent.becker@ens-lyon.org>";
   garbas = "Rok Garbas <rok@garbas.si>";
diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index b7c8111751a6..dda4452f6448 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -1,10 +1,10 @@
-{ useLua ? false
-, usePcre ? false
+{ useLua ? !stdenv.isDarwin
+, usePcre ? true
 , stdenv, fetchurl
-, openssl, zlib, lua ? null, pcre ? null
+, openssl, zlib, lua5_3 ? null, pcre ? null
 }:
 
-assert useLua -> lua != null;
+assert useLua -> lua5_3 != null;
 assert usePcre -> pcre != null;
 
 stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ openssl zlib ]
-    ++ stdenv.lib.optional useLua lua
+    ++ stdenv.lib.optional useLua lua5_3
     ++ stdenv.lib.optional usePcre pcre;
 
   # TODO: make it work on bsd as well
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
     "USE_PCRE_JIT=yes"
   ] ++ stdenv.lib.optionals useLua [
     "USE_LUA=yes"
-    "LUA_LIB=${lua}/lib"
-    "LUA_INC=${lua}/include"
+    "LUA_LIB=${lua5_3}/lib"
+    "LUA_INC=${lua5_3}/include"
   ] ++ stdenv.lib.optional stdenv.isDarwin "CC=cc";
 
   meta = {
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
       hardware.
     '';
     homepage = http://haproxy.1wt.eu;
-    maintainers = [ stdenv.lib.maintainers.garbas ];
+    maintainers = with stdenv.lib.maintainers; [ fuzzy-id garbas ];
     platforms = with stdenv.lib.platforms; linux ++ darwin;
     license = stdenv.lib.licenses.gpl2;
   };