Export PYTHONPATH

.orchestra/config/components.yml

@@ -122,6 +122,7 @@ environment:
   - PKG_CONFIG_PATH: $ORCHESTRA_ROOT/lib/pkgconfig:$ORCHESTRA_ROOT/share/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}
   - INSTALL_LINK_ONLY_PATH: $ORCHESTRA_ROOT/link-only
   - LIBGL_DRIVERS_PATH: $ORCHESTRA_ROOT/lib/dri${LIBGL_DRIVERS_PATH:+:${LIBGL_DRIVERS_PATH}}
+  - PYTHONPATH: $ORCHESTRA_ROOT/lib/python${PYTHONPATH:+:${PYTHONPATH}}
 
 paths: #@ data.values.paths or {}
 remote_base_urls: #@ data.values.remote_base_urls or []

.orchestra/config/components/revng_distributable.yml

@@ -82,12 +82,13 @@ install: |
   ORCHESTRA_ROOT="$(realpath -s $(dirname $SCRIPT))/root"
   ORCHESTRA_DOTDIR="/nonexistent_directory_ignore_this"
   unset SCRIPT
-  export PYTHONPATH="$ORCHESTRA_ROOT/lib/python${PYTHONPATH:+:${PYTHONPATH}}"
   export PS1="[orchestra] $PS1"
   '
 
   cat >> environment <<EOF
-  $(orchestra environment | grep -E "^export (PATH|LIBGL_DRIVERS_PATH|PKG_CONFIG_PATH|QML2_IMPORT_PATH|QT_PLUGIN_PATH)")
+  $(orchestra environment | grep -E "^export (PATH|LIBGL_DRIVERS_PATH|PKG_CONFIG_PATH|QML2_IMPORT_PATH|QT_PLUGIN_PATH|PYTHONPATH)")
+  unset ORCHESTRA_DOTDIR
+  unset ORCHESTRA_ROOT
   EOF
 
 skip_post_install: true