From 213e0e9b49bee9caff61ece716ab386db6e86d32 Mon Sep 17 00:00:00 2001 From: The Tumultuous Unicorn Of Darkness Date: Tue, 21 Jan 2025 20:36:40 +0100 Subject: [PATCH] [Daemon] Fix start_daemon() for Flatpak on AArch64 --- src/daemon_client.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/daemon_client.cpp b/src/daemon_client.cpp index 83e81685..25180955 100644 --- a/src/daemon_client.cpp +++ b/src/daemon_client.cpp @@ -76,9 +76,14 @@ const char *start_daemon(bool graphical) app_path = match[1].str() + "/lib/" + PRGNAME_LOW + "/" + DAEMON_EXEC; else if(std::regex_search(line, match, runtime_path_regex)) { +# if defined(__x86_64__) std::string runtime_path = match[1].str() + "/lib/x86_64-linux-gnu"; - ld_library_path = "LD_LIBRARY_PATH=" + runtime_path; ld_linux_path = runtime_path + "/ld-linux-x86-64.so.2"; +# elif defined(__aarch64__) + std::string runtime_path = match[1].str() + "/lib/aarch64-linux-gnu"; + ld_linux_path = runtime_path + "/ld-linux-aarch64.so.1"; +# endif + ld_library_path = "LD_LIBRARY_PATH=" + runtime_path; } }