Merge pull request mixxxdj#1455 from sblaisot/remove_nsis

Remove NSIS files as we now have completely switched to wix
davidhm · Jan 6, 2018 · 9e10050 · 9e10050
2 parents 1db89c9 + 3b73e0d
commit 9e10050
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 2,187 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -38,10 +38,6 @@ install:
   - call set ENVIRONMENT_NAME=%%ENVIRONMENT_NAME:PLATFORM=%platform%%%
   - call set ENVIRONMENT_NAME=%%ENVIRONMENT_NAME:CONFIGURATION=%configuration%%%
   - cd %TEMP%
-  # Not needed anymore since we switched to wix
-  #- echo *** Patching NSIS
-  #- cd %APPVEYOR_BUILD_FOLDER%
-  #- patch "C:\Program Files (x86)\NSIS\Include\MultiUser.nsh" < build\appveyor\NSIS.patch
   - echo *** Downloading precompiled build environment if not in build-cache
   - cd %APPVEYOR_BUILD_FOLDER%
   - build\windows\install_buildenv.bat %ENVIRONMENTS_URL% %ENVIRONMENT_NAME% %ENVIRONMENTS_PATH%

diff --git a/build/appveyor/NSIS.patch b/build/appveyor/NSIS.patch
diff --git a/build/nsis/Mixxx-garth.nsi b/build/nsis/Mixxx-garth.nsi