From 777ddf434a966966dc8918322c1ec9ee3f822ee2 Mon Sep 17 00:00:00 2001 From: Amr Bashir Date: Tue, 12 Dec 2023 12:17:03 +0200 Subject: [PATCH] fix(bundler): unset `NSISDIR` and `NSISCONFDIR` when running `makensis` (#8376) closes #8359 --- .changes/bundler-nsis-nsisdir.md | 5 +++++ tooling/bundler/src/bundle/windows/nsis.rs | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 .changes/bundler-nsis-nsisdir.md diff --git a/.changes/bundler-nsis-nsisdir.md b/.changes/bundler-nsis-nsisdir.md new file mode 100644 index 000000000000..ecf8111b48bf --- /dev/null +++ b/.changes/bundler-nsis-nsisdir.md @@ -0,0 +1,5 @@ +--- +'tauri-bundler': 'patch:bug' +--- + +Unset `NSISDIR` and `NSISCONFDIR` when running `makensis.exe` so it doesn't conflict with NSIS installed by the user. diff --git a/tooling/bundler/src/bundle/windows/nsis.rs b/tooling/bundler/src/bundle/windows/nsis.rs index 893630238c7b..13299d6b8bad 100644 --- a/tooling/bundler/src/bundle/windows/nsis.rs +++ b/tooling/bundler/src/bundle/windows/nsis.rs @@ -457,6 +457,8 @@ fn build_nsis_app_installer( _ => "-V4", }) .arg(installer_nsi_path) + .env_remove("NSISDIR") + .env_remove("NSISCONFDIR") .current_dir(output_path) .piped() .context("error running makensis.exe")?;