From d2409b9de05eb0a41128f9808c4ca6fe4da2bcee Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Sun, 23 Jan 2022 09:51:45 +0000 Subject: [PATCH] do not set LD_LIBRARY_PATH and GSETTINGS_SCHEMA_DIR on flatpak builds --- data/meson.build | 1 + data/zrythm_launch.in | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/data/meson.build b/data/meson.build index 290981e32..3aee69e60 100644 --- a/data/meson.build +++ b/data/meson.build @@ -55,6 +55,7 @@ zrythm_launcher_config.set ('LIBDIR', libdir) zrythm_launcher_config.set ( 'LD_LIBRARY_PATH_ENV', os_darwin ? 'DYLD_LIBRARY_PATH' : 'LD_LIBRARY_PATH') +zrythm_launcher_config.set ('FLATPAK_BUILD', get_option ('for_flathub') ? '1' : '0') # install desktop file and launcher scripts if os_gnu or os_freebsd or os_darwin diff --git a/data/zrythm_launch.in b/data/zrythm_launch.in index 6f661a1b2..140b0f6dd 100644 --- a/data/zrythm_launch.in +++ b/data/zrythm_launch.in @@ -17,10 +17,12 @@ # You should have received a copy of the GNU Affero General Public License # along with Zrythm. If not, see . -jack_path=$(dirname $(ldconfig -p | grep 'libjack.so ' | head -n 1 | cut -d ' ' -f 4)) -export @LD_LIBRARY_PATH_ENV@="@ZRYTHM_CARLA_LIBDIR@:@ZRYTHM_LIBDIR@:$jack_path:@LIBDIR@:$@LD_LIBRARY_PATH_ENV@" +if [ "@FLATPAK_BUILD@" != "1" ]; then + jack_path=$(dirname $(ldconfig -p | grep 'libjack.so ' | head -n 1 | cut -d ' ' -f 4)) + export @LD_LIBRARY_PATH_ENV@="@ZRYTHM_CARLA_LIBDIR@:@ZRYTHM_LIBDIR@:$jack_path:@LIBDIR@:$@LD_LIBRARY_PATH_ENV@" -export GSETTINGS_SCHEMA_DIR=@SCHEMAS_DIR@ + export GSETTINGS_SCHEMA_DIR=@SCHEMAS_DIR@ +fi # if not first run, set language so that pre-startup # output is localized to the user's choice instead