Browse Source

do not set LD_LIBRARY_PATH and GSETTINGS_SCHEMA_DIR on flatpak builds

audio_region_bpm_change_fix
parent
commit
d2409b9de0
Signed by: alex
GPG Key ID: 022EAE42313D70F3
  1. 1
      data/meson.build
  2. 8
      data/zrythm_launch.in

1
data/meson.build

@ -55,6 +55,7 @@ zrythm_launcher_config.set ('LIBDIR', libdir) @@ -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

8
data/zrythm_launch.in

@ -17,10 +17,12 @@ @@ -17,10 +17,12 @@
# You should have received a copy of the GNU Affero General Public License
# along with Zrythm. If not, see <https://www.gnu.org/licenses/>.
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

Loading…
Cancel
Save