Add support for flatpak extensions
This commit is contained in:
parent
3f2d4e5085
commit
5e712768cf
|
@ -28,11 +28,16 @@ import sys
|
||||||
import tempfile
|
import tempfile
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
|
import gajim
|
||||||
from gajim.common.const import PathType, PathLocation
|
from gajim.common.const import PathType, PathLocation
|
||||||
|
|
||||||
|
|
||||||
def get(key):
|
def get(key):
|
||||||
if key == 'PLUGINS_DIRS':
|
if key == 'PLUGINS_DIRS':
|
||||||
|
if gajim.IS_FLATPAK:
|
||||||
|
return ['/app/plugins',
|
||||||
|
_paths['PLUGINS_BASE']]
|
||||||
|
else:
|
||||||
return [_paths['PLUGINS_BASE'],
|
return [_paths['PLUGINS_BASE'],
|
||||||
_paths['PLUGINS_USER']]
|
_paths['PLUGINS_USER']]
|
||||||
return _paths[key]
|
return _paths[key]
|
||||||
|
|
|
@ -22,8 +22,19 @@
|
||||||
"--filesystem=xdg-run/dconf",
|
"--filesystem=xdg-run/dconf",
|
||||||
"--filesystem=~/.config/dconf:ro",
|
"--filesystem=~/.config/dconf:ro",
|
||||||
"--talk-name=ca.desrt.dconf",
|
"--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": {
|
"build-options": {
|
||||||
"cflags": "-O2 -g",
|
"cflags": "-O2 -g",
|
||||||
"cxxflags": "-O2 -g"
|
"cxxflags": "-O2 -g"
|
||||||
|
@ -370,6 +381,9 @@
|
||||||
"sha256": "02f71f0921d67433ecdca7f0b682a63cadaa7a057fa68608f1ec7ce3fae44fb9",
|
"sha256": "02f71f0921d67433ecdca7f0b682a63cadaa7a057fa68608f1ec7ce3fae44fb9",
|
||||||
"dest": "gajim/data/plugins/plugin_installer"
|
"dest": "gajim/data/plugins/plugin_installer"
|
||||||
}
|
}
|
||||||
|
],
|
||||||
|
"post-install": [
|
||||||
|
"install -d /app/plugins"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in New Issue