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

prosody: added websocket support

This commit is contained in:
Markus Kohlhase 2014-10-15 03:57:00 +02:00
parent 163b53f706
commit 5308d3284b
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/networking/prosody.nix
View File

@ -91,6 +91,11 @@ let
description = "Serve static files from a directory over HTTP"; description = "Serve static files from a directory over HTTP";
}; };
websocket = mkOption {
default = false;
description = "Enable WebSocket support";
};
}; };
createSSLOptsStr = o: createSSLOptsStr = o:

13
pkgs/servers/xmpp/prosody/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, lua5, luasocket, luasec, luaexpat, luafilesystem, libidn, openssl, makeWrapper }: { stdenv, fetchurl, lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop, libidn, openssl, makeWrapper, fetchhg }:
let let
libs = [ luasocket luasec luaexpat luafilesystem ]; libs = [ luasocket luasec luaexpat luafilesystem luabitop ];
getPath = lib : type : "${lib}/lib/lua/${lua5.luaversion}/?.${type};${lib}/share/lua/${lua5.luaversion}/?.${type}"; getPath = lib : type : "${lib}/lib/lua/${lua5.luaversion}/?.${type};${lib}/share/lua/${lua5.luaversion}/?.${type}";
getLuaPath = lib : getPath lib "lua"; getLuaPath = lib : getPath lib "lua";
getLuaCPath = lib : getPath lib "so"; getLuaCPath = lib : getPath lib "so";
@ -17,7 +17,13 @@ stdenv.mkDerivation rec {
sha256 = "be87cf31901a25477869b4ebd52e298f63a5effacae526911a0be876cc82e1c6"; sha256 = "be87cf31901a25477869b4ebd52e298f63a5effacae526911a0be876cc82e1c6";
}; };
buildInputs = [ lua5 luasocket luasec luaexpat libidn openssl makeWrapper ]; communityModules = fetchhg {
url = "http://prosody-modules.googlecode.com/hg/";
rev = "4b55110b0aa8";
sha256 = "0010x2rl9f9ihy2nwqan2jdlz25433srj2zna1xh10490mc28hij";
};
buildInputs = [ lua5 luasocket luasec luaexpat luabitop libidn openssl makeWrapper ];
configureFlags = [ configureFlags = [
"--ostype=linux" "--ostype=linux"
@ -26,6 +32,7 @@ stdenv.mkDerivation rec {
]; ];
postInstall = '' postInstall = ''
cp $communityModules/mod_websocket/mod_websocket.lua $out/lib/prosody/modules/
wrapProgram $out/bin/prosody \ wrapProgram $out/bin/prosody \
--set LUA_PATH '"${luaPath};"' \ --set LUA_PATH '"${luaPath};"' \
--set LUA_CPATH '"${luaCPath};"' --set LUA_CPATH '"${luaCPath};"'

2
pkgs/top-level/all-packages.nix
View File

@ -7139,7 +7139,7 @@ let
prosody = recurseIntoAttrs ( prosody = recurseIntoAttrs (
callPackage ../servers/xmpp/prosody { callPackage ../servers/xmpp/prosody {
lua5 = lua5_1; lua5 = lua5_1;
inherit (lua51Packages) luasocket luasec luaexpat luafilesystem; inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop;
}); });
elasticmq = callPackage ../servers/elasticmq { }; elasticmq = callPackage ../servers/elasticmq { };