[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#33386] [PATCH 1/2] gnu: gajim: Add support for Guix packaged plugin
From: |
Clément Lassieur |
Subject: |
[bug#33386] [PATCH 1/2] gnu: gajim: Add support for Guix packaged plugins. |
Date: |
Wed, 14 Nov 2018 20:55:52 +0100 |
* gnu/packages/messaging.scm (gajim)[arguments]: Add an 'add-plugin-dirs'
phase. Export PYTHONPATH in the wrapper.
[inputs]: Remove python-axolotl and python-qrcode.
---
gnu/packages/messaging.scm | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index c22cacfd3..f68b7e4eb 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -588,15 +588,29 @@ was initially a fork of xmpppy, but uses non-blocking
sockets.")
`(#:test-target "test_nogui"
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'add-plugin-dirs
+ (lambda _
+ (substitute* "gajim/common/configpaths.py"
+ (("_paths\\['PLUGINS_USER'\\]")
+ (string-append
+ "_paths['PLUGINS_USER'],os.path.expanduser"
+ "('~/.guix-profile/share/gajim/plugins')")))
+ #t))
(add-after 'install 'wrap-program
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(for-each
(lambda (name)
(let ((file (string-append out "/bin/" name))
- (gi-typelib-path (getenv "GI_TYPELIB_PATH")))
+ (gi-typelib-path (getenv "GI_TYPELIB_PATH"))
+ (pythonpath (string-append
+ "$HOME/.guix-profile/lib/python"
+ ,(version-major+minor
+ (package-version python))
+ "/site-packages")))
(wrap-program file
- `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))))
+ `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
+ `("PYTHONPATH" ":" prefix (,pythonpath)))))
'("gajim" "gajim-remote" "gajim-history-manager")))
#t))
(add-after 'install 'install-icons
@@ -636,7 +650,6 @@ was initially a fork of xmpppy, but uses non-blocking
sockets.")
("gtkspell3" ,gtkspell3)
("hicolor-icon-theme" ,hicolor-icon-theme)
("libsecret" ,libsecret)
- ("python-axolotl" ,python-axolotl)
("python-cssutils" ,python-cssutils)
("python-dbus" ,python-dbus)
("python-gnupg" ,python-gnupg)
@@ -646,8 +659,7 @@ was initially a fork of xmpppy, but uses non-blocking
sockets.")
("python-precis-i18n" ,python-precis-i18n)
("python-pycairo" ,python-pycairo)
("python-pygobject" ,python-pygobject)
- ("python-pyopenssl" ,python-pyopenssl)
- ("python-qrcode" ,python-qrcode)))
+ ("python-pyopenssl" ,python-pyopenssl)))
(home-page "https://gajim.org/")
(synopsis "Jabber (XMPP) client")
(description "Gajim is a feature-rich and easy to use Jabber/XMPP client.
--
2.19.1
- [bug#33386] Gajim plugins, Clément Lassieur, 2018/11/14
- [bug#33386] [PATCH 1/2] gnu: gajim: Add support for Guix packaged plugins.,
Clément Lassieur <=
[bug#33386] Gajim plugins, Clément Lassieur, 2018/11/14