From 17ef17cfd0a94bd4f76f960185215ea3911267c5 Mon Sep 17 00:00:00 2001
From: sh <37271604+shumvgolove@users.noreply.github.com>
Date: Mon, 27 Apr 2026 16:05:30 +0000
Subject: [PATCH] desktop: fix build (#6896)

* desktop: fix nanohttpd jitpack dependency

* desktop: make assets-dir gradle flag optional
---
 apps/multiplatform/common/build.gradle.kts | 4 ++--
 scripts/ci/build-desktop-mac.sh            | 9 +++++++--
 scripts/desktop/make-appimage-linux.sh     | 7 ++++++-
 scripts/desktop/make-deb-linux.sh          | 7 ++++++-
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/apps/multiplatform/common/build.gradle.kts b/apps/multiplatform/common/build.gradle.kts
index c3a4beb823..65f0acd86c 100644
--- a/apps/multiplatform/common/build.gradle.kts
+++ b/apps/multiplatform/common/build.gradle.kts
@@ -142,8 +142,8 @@ kotlin {
         implementation("org.slf4j:slf4j-simple:2.0.12")
         implementation("uk.co.caprica:vlcj:4.8.3")
         implementation("net.java.dev.jna:jna:5.14.0")
-        implementation("com.github.NanoHttpd.nanohttpd:nanohttpd:efb2ebf85a")
-        implementation("com.github.NanoHttpd.nanohttpd:nanohttpd-websocket:efb2ebf85a")
+        implementation("com.github.NanoHttpd.nanohttpd:nanohttpd:efb2ebf")
+        implementation("com.github.NanoHttpd.nanohttpd:nanohttpd-websocket:efb2ebf")
         implementation("com.squareup.okhttp3:okhttp:4.12.0")
       }
     }
diff --git a/scripts/ci/build-desktop-mac.sh b/scripts/ci/build-desktop-mac.sh
index a09c2e9ac1..044d407b3a 100755
--- a/scripts/ci/build-desktop-mac.sh
+++ b/scripts/ci/build-desktop-mac.sh
@@ -16,5 +16,10 @@ security unlock-keychain -p "" /tmp/simplex.keychain
 security list-keychains -s `security list-keychains | xargs` /tmp/simplex.keychain
 scripts/desktop/build-lib-mac.sh
 cd apps/multiplatform
-./gradlew -Psimplex.assets.dir="$ASSETS_DIR" packageDmg
-./gradlew -Psimplex.assets.dir="$ASSETS_DIR" notarizeDmg
+if [ -n "${ASSETS_DIR:-}" ]; then
+  set -- -Psimplex.assets.dir="$ASSETS_DIR"
+else
+  set --
+fi
+./gradlew "$@" packageDmg
+./gradlew "$@" notarizeDmg
diff --git a/scripts/desktop/make-appimage-linux.sh b/scripts/desktop/make-appimage-linux.sh
index a9286a2eb1..650c98d522 100755
--- a/scripts/desktop/make-appimage-linux.sh
+++ b/scripts/desktop/make-appimage-linux.sh
@@ -18,7 +18,12 @@ libcrypto_path=$(ldd common/src/commonMain/cpp/desktop/libs/*/libHSdirect-sqlcip
 trap "rm common/src/commonMain/cpp/desktop/libs/*/`basename $libcrypto_path` 2> /dev/null || true" EXIT
 cp $libcrypto_path common/src/commonMain/cpp/desktop/libs/*
 
-./gradlew -Psimplex.assets.dir="$ASSETS_DIR" createDistributable
+if [ -n "${ASSETS_DIR:-}" ]; then
+  set -- -Psimplex.assets.dir="$ASSETS_DIR"
+else
+  set --
+fi
+./gradlew "$@" createDistributable
 rm common/src/commonMain/cpp/desktop/libs/*/`basename $libcrypto_path`
 
 rm -rf $release_app_dir/AppDir 2>/dev/null
diff --git a/scripts/desktop/make-deb-linux.sh b/scripts/desktop/make-deb-linux.sh
index 72d42c23cc..0fa543a81d 100755
--- a/scripts/desktop/make-deb-linux.sh
+++ b/scripts/desktop/make-deb-linux.sh
@@ -4,7 +4,12 @@ ARCH="$(uname -m)"
 
 scripts/desktop/build-lib-linux.sh
 cd apps/multiplatform
-./gradlew -Psimplex.assets.dir="$ASSETS_DIR" packageDeb
+if [ -n "${ASSETS_DIR:-}" ]; then
+  set -- -Psimplex.assets.dir="$ASSETS_DIR"
+else
+  set --
+fi
+./gradlew "$@" packageDeb
 
 # Workaround for skiko library
 #