diff options
| -rw-r--r-- | lib/maintainers.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/networking/haproxy/default.nix | 36 |
2 files changed, 31 insertions, 6 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 4f5ee4b0801..200d900e382 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 3b7a68fb972..dda4452f644 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,4 +1,11 @@ -{ stdenv, pkgs, fetchurl, openssl, zlib }: +{ useLua ? !stdenv.isDarwin +, usePcre ? true +, stdenv, fetchurl +, openssl, zlib, lua5_3 ? null, pcre ? null +}: + +assert useLua -> lua5_3 != null; +assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; @@ -12,12 +19,29 @@ stdenv.mkDerivation rec { sha256 = "ebb31550a5261091034f1b6ac7f4a8b9d79a8ce2a3ddcd7be5b5eb355c35ba65"; }; - buildInputs = [ openssl zlib ]; + buildInputs = [ openssl zlib ] + ++ stdenv.lib.optional useLua lua5_3 + ++ stdenv.lib.optional usePcre pcre; # TODO: make it work on bsd as well - preConfigure = '' - export makeFlags="TARGET=${if stdenv.isSunOS then "solaris" else if stdenv.isLinux then "linux2628" else "generic"} PREFIX=$out USE_OPENSSL=yes USE_ZLIB=yes ${stdenv.lib.optionalString stdenv.isDarwin "CC=cc USE_KQUEUE=1"}" - ''; + makeFlags = [ + "PREFIX=\${out}" + ("TARGET=" + (if stdenv.isSunOS then "solaris" + else if stdenv.isLinux then "linux2628" + else if stdenv.isDarwin then "osx" + else "generic")) + ]; + buildFlags = [ + "USE_OPENSSL=yes" + "USE_ZLIB=yes" + ] ++ stdenv.lib.optionals usePcre [ + "USE_PCRE=yes" + "USE_PCRE_JIT=yes" + ] ++ stdenv.lib.optionals useLua [ + "USE_LUA=yes" + "LUA_LIB=${lua5_3}/lib" + "LUA_INC=${lua5_3}/include" + ] ++ stdenv.lib.optional stdenv.isDarwin "CC=cc"; meta = { description = "Reliable, high performance TCP/HTTP load balancer"; @@ -30,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; }; |