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/top-level | |
parent | 208400cb3e75892595906e1f87c23405305843d0 (diff) | |
download | nixlib-1b4722ac821bed100efeb53bf4490fc797a8375f.tar nixlib-1b4722ac821bed100efeb53bf4490fc797a8375f.tar.gz nixlib-1b4722ac821bed100efeb53bf4490fc797a8375f.tar.bz2 nixlib-1b4722ac821bed100efeb53bf4490fc797a8375f.tar.lz nixlib-1b4722ac821bed100efeb53bf4490fc797a8375f.tar.xz nixlib-1b4722ac821bed100efeb53bf4490fc797a8375f.tar.zst nixlib-1b4722ac821bed100efeb53bf4490fc797a8375f.zip |
prosody: add dependency on zlib (close #6894)
@vcunat moved the defaults inside the prosody expression.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/lua-packages.nix | 33 |
2 files changed, 33 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 766dd90d25a6..d7ec3b8fcbf6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8266,8 +8266,7 @@ let prosody = callPackage ../servers/xmpp/prosody { lua5 = lua5_1; - inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent; - withLibevent = true; + inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib; }; elasticmq = callPackage ../servers/elasticmq { }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index ce75904418da..766ff90d5b7b 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -7,7 +7,7 @@ { fetchurl, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo -, perl, gtk, python, glib, gobjectIntrospection, libevent +, perl, gtk, python, glib, gobjectIntrospection, libevent, zlib }: let @@ -205,6 +205,37 @@ let }; }; + luazlib = buildLuaPackage rec { + name = "zlib-${version}"; + version = "0.4"; + + src = fetchurl { + url = "https://github.com/brimworks/lua-zlib/archive/v${version}.tar.gz"; + sha256 = "1l32nwyh8b4vicxvlhbv9qhkhklbhvjfn8wd72bjk7ac9kz172rd"; + }; + + buildInputs = [ zlib ]; + + preBuild = '' + makeFlagsArray=( + linux + LUAPATH="$out/share/lua/${lua.luaversion}" + LUACPATH="$out/lib/lua/${lua.luaversion}" + INCDIR="-I${lua}/include" + LIBDIR="-L$out/lib"); + ''; + + preInstall = "mkdir -p $out/lib/lua/${lua.luaversion}"; + + meta = with stdenv.lib; { + homepage = https://github.com/brimworks/lua-zlib; + hydraPlatforms = platforms.linux; + license = licenses.mit; + maintainers = [ maintainers.koral ]; + }; + }; + + luastdlib = buildLuaPackage { name = "stdlib"; src = fetchurl { |