From 7276b251098586541e2bd10cb0aaaf08c6ea23ee Mon Sep 17 00:00:00 2001
From: tobtoht <tob@featherwallet.org>
Date: Wed, 5 Apr 2023 17:42:50 +0200
Subject: [PATCH] Updater: fix platform tags for riscv and mac-arm64

---
 cmake/config-feather.h.cmake  | 2 ++
 contrib/guix/libexec/build.sh | 2 +-
 src/utils/Updater.cpp         | 8 +++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/cmake/config-feather.h.cmake b/cmake/config-feather.h.cmake
index 55fa424..c062336 100644
--- a/cmake/config-feather.h.cmake
+++ b/cmake/config-feather.h.cmake
@@ -6,4 +6,6 @@
 
 #define TOR_VERSION "@TOR_VERSION@"
 
+#define FEATHER_TARGET_TRIPLET "@FEATHER_TARGET_TRIPLET@"
+
 #endif //FEATHER_VERSION_H
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index 746a244..3ef6fb9 100755
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -273,7 +273,7 @@ mkdir -p "$DISTSRC"
 
 
     # Set appropriate CMake options for build type
-    CMAKEVARS="-DWITH_SCANNER=On -DCHECK_UPDATES=On -DSELF_CONTAINED=On -DDONATE_BEG=On"
+    CMAKEVARS="-DWITH_SCANNER=On -DCHECK_UPDATES=On -DSELF_CONTAINED=On -DDONATE_BEG=On -DFEATHER_TARGET_TRIPLET=${HOST}"
     ANONDIST=""
     case "$HOST" in
         *mingw32)
diff --git a/src/utils/Updater.cpp b/src/utils/Updater.cpp
index 35ea692..685d382 100644
--- a/src/utils/Updater.cpp
+++ b/src/utils/Updater.cpp
@@ -133,7 +133,11 @@ void Updater::onSignedHashesReceived(QNetworkReply *reply, const QString &platfo
 
 QString Updater::getPlatformTag() {
 #ifdef Q_OS_MACOS
-    return "mac";
+    if (QString(FEATHER_TARGET_TRIPLET) == "arm64-apple-darwin") {
+        return "mac-arm64";
+    } else {
+        return "mac";
+    }
 #endif
 #ifdef Q_OS_WIN
     #ifdef PLATFORM_INSTALLER
@@ -149,6 +153,8 @@ QString Updater::getPlatformTag() {
         tag += "linux-arm64";
     } else if (arch == "arm") {
         tag += "linux-arm";
+    } else if (arch == "riscv64") {
+        tag += "linux-riscv64";
     } else {
         tag += "linux";
     }