summaryrefslogtreecommitdiff
path: root/gnu/packages/messaging.scm
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2019-05-13 09:00:55 +0200
committerRicardo Wurmus <rekado@elephly.net>2019-05-13 09:03:03 +0200
commita624c3631077aa3fa5c05849579932c5b67b985c (patch)
tree4b6203337d6ec63b0615f9e827bce6601d53ef54 /gnu/packages/messaging.scm
parent70d23edf937fcf5435c9540b703db045f75b5ef2 (diff)
gnu: gajim: Fix error when GAJIM_PLUGIN_PATH is not set.
Fixes <https://bug.gnu.org/35606> * gnu/packages/messaging.scm (gajim)[arguments]: Handle case when GAJIM_PLUGIN_PATH is unset in add-plugins-dir phase.
Diffstat (limited to 'gnu/packages/messaging.scm')
-rw-r--r--gnu/packages/messaging.scm8
1 files changed, 6 insertions, 2 deletions
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 94d4b0855c..45e9d40a43 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -594,8 +594,12 @@ was initially a fork of xmpppy, but uses non-blocking sockets.")
(add-after 'unpack 'add-plugin-dirs
(lambda _
(substitute* "gajim/common/configpaths.py"
- (("_paths\\['PLUGINS_USER'\\]")
- "_paths['PLUGINS_USER'],os.getenv('GAJIM_PLUGIN_PATH')"))
+ (("_paths\\['PLUGINS_USER'\\]\\]")
+ "_paths['PLUGINS_USER']] + \
+([os.getenv('GAJIM_PLUGIN_PATH')] \
+if os.getenv('GAJIM_PLUGIN_PATH') \
+and Path(os.getenv('GAJIM_PLUGIN_PATH')).is_dir() \
+else [])"))
#t))
(replace 'check
(lambda _