From 36540ce3c3999f97bdb01b228eed0e66a2f20da2 Mon Sep 17 00:00:00 2001 From: Fabian-Lars Date: Mon, 23 Jan 2023 22:32:45 +0100 Subject: [PATCH] feat(bundler): enable arm64 target for nsis bundle (#6070) Co-authored-by: Lucas Nogueira --- tooling/bundler/src/bundle/windows/nsis.rs | 1 + tooling/bundler/src/bundle/windows/templates/installer.nsi | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/tooling/bundler/src/bundle/windows/nsis.rs b/tooling/bundler/src/bundle/windows/nsis.rs index 80e0fae45..06baaf5ca 100644 --- a/tooling/bundler/src/bundle/windows/nsis.rs +++ b/tooling/bundler/src/bundle/windows/nsis.rs @@ -126,6 +126,7 @@ fn build_nsis_app_installer( let arch = match settings.binary_arch() { "x86_64" => "x64", "x86" => "x86", + "aarch64" => "arm64", target => { return Err(crate::Error::ArchError(format!( "unsupported target: {}", diff --git a/tooling/bundler/src/bundle/windows/templates/installer.nsi b/tooling/bundler/src/bundle/windows/templates/installer.nsi index 7d1403271..bc1ac02c7 100644 --- a/tooling/bundler/src/bundle/windows/templates/installer.nsi +++ b/tooling/bundler/src/bundle/windows/templates/installer.nsi @@ -49,6 +49,8 @@ SetCompressor /SOLID lzma !define MULTIUSER_INSTALLMODE_COMMANDLINE !if "${ARCH}" == "x64" !define MULTIUSER_USE_PROGRAMFILES64 + !else if "${ARCH}" == "arm64" + !define MULTIUSER_USE_PROGRAMFILES64 !endif !define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY "${UNINSTKEY}" !define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME "CurrentUser" @@ -288,6 +290,8 @@ Function .onInit ${If} ${RunningX64} !if "${ARCH}" == "x64" StrCpy $INSTDIR "$PROGRAMFILES64\${PRODUCTNAME}" + !else if "${ARCH}" == "arm64" + StrCpy $INSTDIR "$PROGRAMFILES64\${PRODUCTNAME}" !else StrCpy $INSTDIR "$PROGRAMFILES\${PRODUCTNAME}" !endif