diff options
| author | Thomas Holder <thomas@thomas-holder.de> | 2019-03-02 21:41:04 +0000 |
|---|---|---|
| committer | Thomas Holder <thomas@thomas-holder.de> | 2019-03-05 08:18:15 +0000 |
| commit | 67791edc4f8ef12c82ad46db06ec6bd98b815b0e (patch) | |
| tree | 65b9b339a5cd6893697604640a28d32156a9b236 | |
| parent | Update Catalan translation (diff) | |
| download | inkscape-67791edc4f8ef12c82ad46db06ec6bd98b815b0e.tar.gz inkscape-67791edc4f8ef12c82ad46db06ec6bd98b815b0e.zip | |
Restore set_extensions_env()
Function got lost in 408cb49b
Fixes #60
| -rw-r--r-- | packaging/appimage/AppRun | 1 | ||||
| -rw-r--r-- | src/inkscape-main.cpp | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/packaging/appimage/AppRun b/packaging/appimage/AppRun index d2a5aa627..c9e3540f2 100644 --- a/packaging/appimage/AppRun +++ b/packaging/appimage/AppRun @@ -39,7 +39,6 @@ export PATH="${HERE}"/usr/bin/:"${HERE}"/usr/sbin/:"${HERE}"/usr/games/:"${HERE} ############################################################################################ export PYTHONHOME="$HERE/usr/" -export PYTHONPATH="$HERE/usr/share/inkscape/extensions/:$PYTHONPATH" ############################################################################################ # Run experimental bundle that bundles everything if a private ld-linux-x86-64.so.2 is there diff --git a/src/inkscape-main.cpp b/src/inkscape-main.cpp index 3e008558f..bfbefdc18 100644 --- a/src/inkscape-main.cpp +++ b/src/inkscape-main.cpp @@ -15,10 +15,18 @@ #endif #include "inkscape-application.h" +#include "path-prefix.h" +static void set_extensions_env() +{ + gchar *pythonpath = get_extensions_path(); + g_setenv("PYTHONPATH", pythonpath, true); + g_free(pythonpath); +} int main(int argc, char *argv[]) { + set_extensions_env(); if (gtk_init_check(NULL, NULL)) return (ConcreteInkscapeApplication<Gtk::Application>::get_instance()).run(argc, argv); |