Merge pull request #561 from Abestanis/fix/installer_build

Fix Windows installer build
gyunaev · Aug 31, 2023 · e065101 · e065101
2 parents 667494f + e4eb64b
commit e065101
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -100,7 +100,7 @@ jobs:
           fi
       - name: Install installer dependencies
         if: steps.check-deploy.outputs.is_deploy == 'true'
-        run: choco install -y nsis;
+        run: choco install -y nsis --version=3.6;
       - name: Create installer
         if: steps.check-deploy.outputs.is_deploy == 'true'
         working-directory: ${{ runner.workspace }}/build

diff --git a/installer/Utils.nsh b/installer/Utils.nsh
@@ -4,9 +4,9 @@
 !include StrFunc.nsh
 ${StrLoc}
 
-!define ERROR_ALREADY_EXISTS 0x000000b7
-!define ERROR_ACCESS_DENIED 0x5
-!define ERROR_SIGNAL_REFUSED 0x9C
+!define /ifndef ERROR_ALREADY_EXISTS 0x000000b7
+!define /ifndef ERROR_ACCESS_DENIED 0x5
+!define /ifndef ERROR_SIGNAL_REFUSED 0x9C
 
 # === Functions === #