Philipp Hörist pushed to branch master at gajim / gajim
Commits:
5e712768 by André Apitzsch at 2018-05-29T08:34:20+02:00
Add support for flatpak extensions
- - - - -
2 changed files:
- gajim/common/configpaths.py
- org.gajim.Gajim.json
Changes:
=====================================
gajim/common/configpaths.py
=====================================
--- a/gajim/common/configpaths.py
+++ b/gajim/common/configpaths.py
@@ -28,13 +28,18 @@ import sys
import tempfile
from pathlib import Path
+import gajim
from gajim.common.const import PathType, PathLocation
def get(key):
if key == 'PLUGINS_DIRS':
- return [_paths['PLUGINS_BASE'],
- _paths['PLUGINS_USER']]
+ if gajim.IS_FLATPAK:
+ return ['/app/plugins',
+ _paths['PLUGINS_BASE']]
+ else:
+ return [_paths['PLUGINS_BASE'],
+ _paths['PLUGINS_USER']]
return _paths[key]
=====================================
org.gajim.Gajim.json
=====================================
--- a/org.gajim.Gajim.json
+++ b/org.gajim.Gajim.json
@@ -22,8 +22,19 @@
"--filesystem=xdg-run/dconf",
"--filesystem=~/.config/dconf:ro",
"--talk-name=ca.desrt.dconf",
- "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
+ "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
+ /* extensions */
+ "--env=PYTHONPATH=/app/plugins/lib/python3.5/site-packages"
],
+ "add-extensions": {
+ "org.gajim.Gajim.Plugin": {
+ "directory": "plugins",
+ "merge-dirs": "lib/python3.5/site-packages",
+ "subdirectories": true,
+ "no-autodownload": true,
+ "autodelete": true
+ }
+ },
"build-options": {
"cflags": "-O2 -g",
"cxxflags": "-O2 -g"
@@ -370,6 +381,9 @@
"sha256":
"02f71f0921d67433ecdca7f0b682a63cadaa7a057fa68608f1ec7ce3fae44fb9",
"dest": "gajim/data/plugins/plugin_installer"
}
+ ],
+ "post-install": [
+ "install -d /app/plugins"
]
}
]
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/5e712768cf5047c728a7dc96f3b9078c725e34ea
---
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/5e712768cf5047c728a7dc96f3b9078c725e34ea
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits
