diff options
author | Thomas Bach <t.bach@ilexius.de> | 2017-03-29 12:27:50 +0200 |
---|---|---|
committer | Thomas Bach <t.bach@ilexius.de> | 2017-03-29 12:27:50 +0200 |
commit | ea80cd1f1101aa9553a6bdb9896e619593948cef (patch) | |
tree | 3d2251d79976e231c41c1418904afacaac24e630 /pkgs/tools/networking/haproxy | |
parent | 45788aeebed646938f525508bd75ca0319b668d9 (diff) |
haproxy: added fuzzy-id to the list of maintainers
Diffstat (limited to 'pkgs/tools/networking/haproxy')
-rw-r--r-- | pkgs/tools/networking/haproxy/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index b7c8111751a67..dda4452f6448d 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; }; |