From 1b4722ac821bed100efeb53bf4490fc797a8375f Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Thu, 19 Mar 2015 11:31:36 +0000
Subject: prosody: add dependency on zlib (close #6894)

@vcunat moved the defaults inside the prosody expression.
---
 pkgs/servers/xmpp/prosody/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'pkgs/servers/xmpp')

diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index 684a06eff4a..631073da4d4 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -1,11 +1,16 @@
-{ stdenv, fetchurl, lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop, luaevent ? null, libidn, openssl, makeWrapper, fetchhg, withLibevent ? false }:
+{ stdenv, fetchurl, libidn, openssl, makeWrapper, fetchhg
+, lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop, luaevent ? null, luazlib ? null
+, withLibevent ? true, withZlib ? true }:
 
 assert withLibevent -> luaevent != null;
+assert withZlib -> luazlib != null;
 
 with stdenv.lib;
 
 let
-  libs        = [ luasocket luasec luaexpat luafilesystem luabitop ] ++ optional withLibevent luaevent;
+  libs        = [ luasocket luasec luaexpat luafilesystem luabitop ]
+                ++ optional withLibevent luaevent
+                ++ optional withZlib luazlib;
   getPath     = lib : type : "${lib}/lib/lua/${lua5.luaversion}/?.${type};${lib}/share/lua/${lua5.luaversion}/?.${type}";
   getLuaPath  = lib : getPath lib "lua";
   getLuaCPath = lib : getPath lib "so";
@@ -29,7 +34,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ lua5 luasocket luasec luaexpat luabitop libidn openssl makeWrapper ]
-                ++ optional withLibevent luaevent;
+                ++ optional withLibevent luaevent
+                ++ optional withZlib luazlib;
 
   configureFlags = [
     "--ostype=linux"
-- 
cgit 1.4.1