diff options
author | Timo Kaufmann <timokau@zoho.com> | 2018-09-07 17:19:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-07 17:19:46 +0200 |
commit | e326c0156d71fa12e1ef4aa0930c18cd5ba78a40 (patch) | |
tree | eae01858bc5c9fda4c7378a4887842acc6d2a386 /pkgs/applications/networking/instant-messengers | |
parent | 00c6f85d18f12552437618e455feab1938215699 (diff) | |
parent | f5becfb5b02f9071472abe61e86460e41dbb7a5c (diff) | |
download | nixlib-e326c0156d71fa12e1ef4aa0930c18cd5ba78a40.tar nixlib-e326c0156d71fa12e1ef4aa0930c18cd5ba78a40.tar.gz nixlib-e326c0156d71fa12e1ef4aa0930c18cd5ba78a40.tar.bz2 nixlib-e326c0156d71fa12e1ef4aa0930c18cd5ba78a40.tar.lz nixlib-e326c0156d71fa12e1ef4aa0930c18cd5ba78a40.tar.xz nixlib-e326c0156d71fa12e1ef4aa0930c18cd5ba78a40.tar.zst nixlib-e326c0156d71fa12e1ef4aa0930c18cd5ba78a40.zip |
Merge pull request #45728 from Ma27/nixos/weechat-module
nixos/weechat: add module
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
4 files changed, 0 insertions, 122 deletions
diff --git a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix deleted file mode 100644 index 4a8ffaaa261a..000000000000 --- a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, curl, fetchFromGitHub, cjson, olm, luaffi }: - -stdenv.mkDerivation { - name = "weechat-matrix-bridge-2018-05-29"; - src = fetchFromGitHub { - owner = "torhve"; - repo = "weechat-matrix-protocol-script"; - rev = "ace3fefc0e35a627f8a528032df2e3111e41eb1b"; - sha256 = "1snf8vn5n9wzrnqnvdrcli4199s5p114jbjlgrj5c27i53173wqw"; - }; - - patches = [ - ./library-path.patch - ]; - - buildInputs = [ curl cjson olm luaffi ]; - - postPatch = '' - substituteInPlace matrix.lua \ - --replace "/usr/bin/curl" "${curl}/bin/curl" \ - --replace "__NIX_LIB_PATH__" "$out/lib/?.so" \ - --replace "__NIX_OLM_PATH__" "$out/share/?.lua" - - substituteInPlace olm.lua \ - --replace "__NIX_LIB_PATH__" "$out/lib/?.so" - ''; - - installPhase = '' - 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 ${olm}/lib/libolm.so $out/lib/libolm.so - cp ${luaffi}/lib/ffi.so $out/lib/ffi.so - ''; - - meta = with stdenv.lib; { - description = "A WeeChat script in Lua that implements the matrix.org chat protocol"; - homepage = https://github.com/torhve/weechat-matrix-protocol-script; - maintainers = with maintainers; [ ma27 ]; - license = licenses.mit; # see https://github.com/torhve/weechat-matrix-protocol-script/blob/0052e7275ae149dc5241226391c9b1889ecc3c6b/matrix.lua#L53 - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/library-path.patch b/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/library-path.patch deleted file mode 100644 index d9945c2993b7..000000000000 --- a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/library-path.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/matrix.lua b/matrix.lua -index b79f500..32b37a2 100644 ---- a/matrix.lua -+++ b/matrix.lua -@@ -43,6 +43,9 @@ This script maps this as follows: - - ]] - -+package.cpath = package.cpath .. ";__NIX_LIB_PATH__" -+package.path = package.path .. ";__NIX_OLM_PATH__" -+ - local json = require 'cjson' -- apt-get install lua-cjson - local olmstatus, olm = pcall(require, 'olm') -- LuaJIT olm FFI binding ln -s ~/olm/olm.lua /usr/local/share/lua/5.1 - local w = weechat -diff --git a/olm.lua b/olm.lua -index 114649c..4828371 100644 ---- a/olm.lua -+++ b/olm.lua -@@ -17,6 +17,9 @@ - * limitations under the License. - */ - --]] -+ -+package.cpath = package.cpath .. ";__NIX_LIB_PATH__" -+ - local ffi = require'ffi' - - ffi.cdef[[ diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix b/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix deleted file mode 100644 index 4b92d1212c55..000000000000 --- a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchFromGitHub, xmpppy, pydns, substituteAll, buildEnv }: - -stdenv.mkDerivation { - name = "weechat-jabber-2017-08-30"; - - src = fetchFromGitHub { - repo = "weechat-xmpp"; - owner = "sleduc"; - sha256 = "0s02xs0ynld9cxxzj07al364sfglyc5ir1i82133mq0s8cpphnxv"; - rev = "8f6c21f5a160c9318c7a2d8fd5dcac7ab2e0d843"; - }; - - installPhase = '' - mkdir -p $out/share - cp jabber.py $out/share/jabber.py - ''; - - patches = [ - (substituteAll { - src = ./libpath.patch; - env = "${buildEnv { - name = "weechat-xmpp-env"; - paths = [ pydns xmpppy ]; - }}/lib/python2.7/site-packages"; - }) - ]; - - meta = with stdenv.lib; { - description = "A fork of the jabber plugin for weechat"; - homepage = "https://github.com/sleduc/weechat-xmpp"; - maintainers = with maintainers; [ ma27 ]; - license = licenses.gpl3Plus; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch b/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch deleted file mode 100644 index 372c83944a27..000000000000 --- a/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/jabber.py b/jabber.py -index 27006a3..e53c2c0 100644 ---- a/jabber.py -+++ b/jabber.py -@@ -95,6 +95,11 @@ SCRIPT_COMMAND = SCRIPT_NAME - import re - import warnings - -+import sys -+ -+sys.path.append('@env@') -+ -+ - import_ok = True - - try: |