Skip to content

Commit

Permalink
fix(bundler): unset NSISDIR and NSISCONFDIR when running `makensi…
Browse files Browse the repository at this point in the history
…s` (#8376)

closes #8359
  • Loading branch information
amrbashir authored Dec 12, 2023
1 parent 327c7ae commit 777ddf4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
5 changes: 5 additions & 0 deletions .changes/bundler-nsis-nsisdir.md
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 2 additions & 0 deletions tooling/bundler/src/bundle/windows/nsis.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")?;
Expand Down

0 comments on commit 777ddf4

Please sign in to comment.