diff options
author | koral <koral@mailoo.org> | 2015-03-19 11:31:36 +0000 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-04-09 18:40:20 +0200 |
commit | 1b4722ac821bed100efeb53bf4490fc797a8375f (patch) | |
tree | ce80e7fab972a13bc8f1e21624b89cb7f0af62e7 /pkgs/servers/xmpp | |
parent | 208400cb3e75892595906e1f87c23405305843d0 (diff) |
prosody: add dependency on zlib (close #6894)
@vcunat moved the defaults inside the prosody expression.
Diffstat (limited to 'pkgs/servers/xmpp')
-rw-r--r-- | pkgs/servers/xmpp/prosody/default.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 684a06eff4a00..631073da4d4a2 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" |