From 67791edc4f8ef12c82ad46db06ec6bd98b815b0e Mon Sep 17 00:00:00 2001
From: Thomas Holder <thomas@thomas-holder.de>
Date: Sat, 2 Mar 2019 22:41:04 +0100
Subject: Restore set_extensions_env()

Function got lost in 408cb49b

Fixes #60
---
 packaging/appimage/AppRun | 1 -
 src/inkscape-main.cpp     | 8 ++++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

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);
-- 
cgit v1.2.3