From d06d3dbb18c7020a59e9b75b824f1a39c93e4903 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 12 Feb 2017 23:13:44 +0100 Subject: Do last commit properly --- customized/prosody.nix | 6 +++--- 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 @@ { stdenv, fetchurl, libidn, openssl, makeWrapper, fetchhg -, lua5, luasocket, lua5_sec, luaexpat, luafilesystem, luabitop, luaevent ? null, luazlib ? null +, lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop, luaevent ? null, luazlib ? null , withLibevent ? true, withZlib ? true , communityModules ? [], extraLibs ? [], extraModules ? [] }: @@ -10,7 +10,7 @@ assert withZlib -> luazlib != null; with stdenv.lib; let - libs = [ luasocket lua5_sec luaexpat luafilesystem luabitop ] + libs = [ luasocket luasec luaexpat luafilesystem luabitop ] ++ optional withLibevent luaevent ++ optional withZlib luazlib ++ extraLibs; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { sha256 = "0010x2rl9f9ihy2nwqan2jdlz25433srj2zna1xh10490mc28hij"; }; - buildInputs = [ lua5 luasocket lua5_sec luaexpat luabitop libidn openssl makeWrapper ] + buildInputs = [ lua5 luasocket luasec luaexpat luabitop libidn openssl makeWrapper ] ++ optional withLibevent luaevent ++ optional withZlib luazlib; diff --git a/ymir.nix b/ymir.nix index 1afd9dbf..a57edeb6 100644 --- a/ymir.nix +++ b/ymir.nix @@ -48,7 +48,8 @@ in rec { nixpkgs.config.packageOverrides = pkgs: rec { prosody = pkgs.callPackage ./customized/prosody.nix ({ - inherit (pkgs.lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib; + inherit (pkgs.lua51Packages) luasocket luaexpat luafilesystem luabitop luaevent luazlib; + luasec = pkgs.lua5_sec; lua5 = pkgs.lua5_1; communityModules = ["mod_carbons" "mod_reload_modules"]; extraModules = [prosodyAuth]; -- cgit v1.2.3