Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix various environment variables to point to the platform snap directories. #19

Merged
merged 9 commits into from Nov 8, 2016
Merged

Fix various environment variables to point to the platform snap directories. #19

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1f296d9
Fix LD_LIBRARY_PATH to point to the directory where Qt libraries are.
tjyrinki Nov 8, 2016
9b14cb2
Add mesa directory
tjyrinki Nov 8, 2016
40082e2
Add also the mesa drivers and keyboard
tjyrinki Nov 8, 2016
54ad68e
Add fonts, locale and Qt compose env vars
tjyrinki Nov 8, 2016
5763717
Symlinks for fonts and themes.
tjyrinki Nov 8, 2016
6cece69
More paths to point to the platform snap directories.
tjyrinki Nov 8, 2016
d19069e
Merge branch 'master' of github.com:tjyrinki/snapcraft-desktop-helpers
tjyrinki Nov 8, 2016
70931c8
Merge https://github.com/ubuntu/snapcraft-desktop-helpers
tjyrinki Nov 8, 2016
c7a6433
Restore the line in trunk
tjyrinki Nov 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions qt/launcher-specific
View file
Open in desktop
Expand Up @@ -35,6 +35,14 @@ elif [ "$USE_qt5appplatform" = true ]; then
export LD_LIBRARY_PATH=$SNAP/ubuntu-app-platform/usr/lib/$ARCH/mesa-egl:$LD_LIBRARY_PATH
export LIBGL_DRIVERS_PATH=$SNAP/ubuntu-app-platform/usr/lib/$ARCH/dri
export LD_LIBRARY_PATH=$LIBGL_DRIVERS_PATH:$LD_LIBRARY_PATH
export XKB_CONFIG_ROOT=$SNAP/ubuntu-app-platform/usr/share/X11/xkb
export FONTCONFIG_PATH=$SNAP/ubuntu-app-platform/etc/fonts/conf.d
export FONTCONFIG_FILE=$SNAP/ubuntu-app-platform/etc/fonts/fonts.conf
rm -rf $XDG_DATA_HOME/{fontconfig,fonts,fonts-*,themes,.themes}
ln -sf $SNAP/ubuntu-app-platform/usr/share/{fontconfig,fonts,fonts-*,themes} $XDG_DATA_HOME
ln -sfn $SNAP/ubuntu-app-platform/usr/share/themes $SNAP_USER_DATA/.themes
export LOCPATH=$SNAP/ubuntu-app-platform/usr/lib/locale
export QTCOMPOSE=$SNAP/ubuntu-app-platform/usr/share/X11/locale

export LD_LIBRARY_PATH=$SNAP/usr/lib/$ARCH:$SNAP/ubuntu-app-platform/usr/lib/$ARCH:$LD_LIBRARY_PATH
export QT_PLUGIN_PATH=$SNAP/usr/lib/$ARCH/qt5/plugins:$SNAP/ubuntu-app-platform/usr/lib/$ARCH/qt5/plugins
Expand Down