diff options
author | Luka Blaskovic <lblasc@tvbeat.com> | 2019-08-24 10:01:01 +0000 |
---|---|---|
committer | Luka Blaskovic <lblasc@tvbeat.com> | 2019-08-24 10:05:00 +0000 |
commit | 55ae5ff593c02f5a247d39065da5be9d07b7db9b (patch) | |
tree | 2bd089f136ce20828d64714ec458241cec6381f9 /pkgs/applications/networking/irc | |
parent | e9b136e4008f0274a659b717883d998d4478df85 (diff) | |
download | nixlib-55ae5ff593c02f5a247d39065da5be9d07b7db9b.tar nixlib-55ae5ff593c02f5a247d39065da5be9d07b7db9b.tar.gz nixlib-55ae5ff593c02f5a247d39065da5be9d07b7db9b.tar.bz2 nixlib-55ae5ff593c02f5a247d39065da5be9d07b7db9b.tar.lz nixlib-55ae5ff593c02f5a247d39065da5be9d07b7db9b.tar.xz nixlib-55ae5ff593c02f5a247d39065da5be9d07b7db9b.tar.zst nixlib-55ae5ff593c02f5a247d39065da5be9d07b7db9b.zip |
weechat-matrix-bridge: use luaffi from luaPackages
Diffstat (limited to 'pkgs/applications/networking/irc')
-rw-r--r-- | pkgs/applications/networking/irc/weechat/scripts/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/irc/weechat/scripts/default.nix b/pkgs/applications/networking/irc/weechat/scripts/default.nix index 439e0e116141..cd9ecbf43370 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/default.nix @@ -6,7 +6,7 @@ }; weechat-matrix-bridge = callPackage ./weechat-matrix-bridge { - inherit (luaPackages) cjson; + inherit (luaPackages) cjson luaffi; }; wee-slack = callPackage ./wee-slack { diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix index 233fe418df3a..ea5052f37a3f 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix @@ -31,9 +31,9 @@ stdenv.mkDerivation { mkdir -p $out/{share,lib} cp {matrix.lua,olm.lua} $out/share - cp ${cjson}/lib/lua/5.2/cjson.so $out/lib/cjson.so + cp ${cjson}/lib/lua/${cjson.lua.luaversion}/cjson.so $out/lib/cjson.so cp ${olm}/lib/libolm.so $out/lib/libolm.so - cp ${luaffi}/lib/ffi.so $out/lib/ffi.so + cp ${luaffi}/lib/lua/${luaffi.lua.luaversion}/ffi.so $out/lib/ffi.so ''; meta = with stdenv.lib; { |