diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2017-02-12 23:13:44 +0100 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2017-02-12 23:13:44 +0100 |
commit | d06d3dbb18c7020a59e9b75b824f1a39c93e4903 (patch) | |
tree | feeda0141c0ffdf1a5d82af1ba5a35ed8863ab66 | |
parent | cf92c8d096fac5cbe786bf1cbe69a7806e2f0d7e (diff) | |
download | nixos-d06d3dbb18c7020a59e9b75b824f1a39c93e4903.tar nixos-d06d3dbb18c7020a59e9b75b824f1a39c93e4903.tar.gz nixos-d06d3dbb18c7020a59e9b75b824f1a39c93e4903.tar.bz2 nixos-d06d3dbb18c7020a59e9b75b824f1a39c93e4903.tar.xz nixos-d06d3dbb18c7020a59e9b75b824f1a39c93e4903.zip |
Do last commit properly
-rw-r--r-- | customized/prosody.nix | 6 | ||||
-rw-r--r-- | ymir.nix | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/customized/prosody.nix b/customized/prosody.nix index c7ca03c5..a3445517 100644 --- a/customized/prosody.nix +++ b/customized/prosody.nix | |||
@@ -1,5 +1,5 @@ | |||
1 | { stdenv, fetchurl, libidn, openssl, makeWrapper, fetchhg | 1 | { stdenv, fetchurl, libidn, openssl, makeWrapper, fetchhg |
2 | , lua5, luasocket, lua5_sec, luaexpat, luafilesystem, luabitop, luaevent ? null, luazlib ? null | 2 | , lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop, luaevent ? null, luazlib ? null |
3 | , withLibevent ? true, withZlib ? true | 3 | , withLibevent ? true, withZlib ? true |
4 | , communityModules ? [], extraLibs ? [], extraModules ? [] | 4 | , communityModules ? [], extraLibs ? [], extraModules ? [] |
5 | }: | 5 | }: |
@@ -10,7 +10,7 @@ assert withZlib -> luazlib != null; | |||
10 | with stdenv.lib; | 10 | with stdenv.lib; |
11 | 11 | ||
12 | let | 12 | let |
13 | libs = [ luasocket lua5_sec luaexpat luafilesystem luabitop ] | 13 | libs = [ luasocket luasec luaexpat luafilesystem luabitop ] |
14 | ++ optional withLibevent luaevent | 14 | ++ optional withLibevent luaevent |
15 | ++ optional withZlib luazlib | 15 | ++ optional withZlib luazlib |
16 | ++ extraLibs; | 16 | ++ extraLibs; |
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec { | |||
40 | sha256 = "0010x2rl9f9ihy2nwqan2jdlz25433srj2zna1xh10490mc28hij"; | 40 | sha256 = "0010x2rl9f9ihy2nwqan2jdlz25433srj2zna1xh10490mc28hij"; |
41 | }; | 41 | }; |
42 | 42 | ||
43 | buildInputs = [ lua5 luasocket lua5_sec luaexpat luabitop libidn openssl makeWrapper ] | 43 | buildInputs = [ lua5 luasocket luasec luaexpat luabitop libidn openssl makeWrapper ] |
44 | ++ optional withLibevent luaevent | 44 | ++ optional withLibevent luaevent |
45 | ++ optional withZlib luazlib; | 45 | ++ optional withZlib luazlib; |
46 | 46 | ||
@@ -48,7 +48,8 @@ in rec { | |||
48 | nixpkgs.config.packageOverrides = pkgs: | 48 | nixpkgs.config.packageOverrides = pkgs: |
49 | rec { | 49 | rec { |
50 | prosody = pkgs.callPackage ./customized/prosody.nix ({ | 50 | prosody = pkgs.callPackage ./customized/prosody.nix ({ |
51 | inherit (pkgs.lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib; | 51 | inherit (pkgs.lua51Packages) luasocket luaexpat luafilesystem luabitop luaevent luazlib; |
52 | luasec = pkgs.lua5_sec; | ||
52 | lua5 = pkgs.lua5_1; | 53 | lua5 = pkgs.lua5_1; |
53 | communityModules = ["mod_carbons" "mod_reload_modules"]; | 54 | communityModules = ["mod_carbons" "mod_reload_modules"]; |
54 | extraModules = [prosodyAuth]; | 55 | extraModules = [prosodyAuth]; |