diff options
| author | Matthieu Coudron <mattator@gmail.com> | 2019-08-25 12:32:28 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-25 12:32:28 +0900 |
| commit | 83a87644b447dc9c5b3ebbdb8be50f36f5f438b9 (patch) | |
| tree | bb7af6c42d0a77dfb11c5c2f323e3a3d79a7a408 /pkgs/applications | |
| parent | bb79cc9d5f9a1e6c5b4c49f70cb14d848baf46cf (diff) | |
| parent | 55ae5ff593c02f5a247d39065da5be9d07b7db9b (diff) | |
| download | nixpkgs-83a87644b447dc9c5b3ebbdb8be50f36f5f438b9.tar nixpkgs-83a87644b447dc9c5b3ebbdb8be50f36f5f438b9.tar.gz nixpkgs-83a87644b447dc9c5b3ebbdb8be50f36f5f438b9.tar.bz2 nixpkgs-83a87644b447dc9c5b3ebbdb8be50f36f5f438b9.tar.lz nixpkgs-83a87644b447dc9c5b3ebbdb8be50f36f5f438b9.tar.xz nixpkgs-83a87644b447dc9c5b3ebbdb8be50f36f5f438b9.tar.zst nixpkgs-83a87644b447dc9c5b3ebbdb8be50f36f5f438b9.zip | |
Merge pull request #67382 from lblasc/remove-luaffi
luaffi: remove in favor of luaPackages.luaffi
Diffstat (limited to 'pkgs/applications')
| -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 439e0e11614..cd9ecbf4337 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 233fe418df3..ea5052f37a3 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; { |