public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prosody: add dependency on zlib (close #6894)

Browse Source 
@vcunat moved the defaults inside the prosody expression.
This commit is contained in:
koral
2015-04-09 18:40:20 +02:00
committed by Vladimír Čunát
parent 208400cb3e
commit 1b4722ac82
3 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/xmpp/prosody/default.nix
+9 -3
View File
@@ -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"