Skip to content

Commit

Permalink
Change all mentions of qt5 to qt@5 on macOS (melonDS-emu#937)
Browse files Browse the repository at this point in the history
* Change all mentions of qt5 to qt@5 on macOS

* Use temporary workaround to get macOS brew updating

actions/runner-images#2322 (comment)

* Don't install CMake, it is already installed in the macOS runner
  • Loading branch information
RayyanAnsari authored Jan 13, 2021
1 parent c109235 commit 8829b05
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ jobs:
- name: Install dependencies
working-directory: ${{runner.workspace}}
run: |
brew install cmake sdl2 qt5 libslirp libarchive
rm -rf /usr/local/bin/2to3 # Temporary workaround suggested here - https://github.com/actions/virtual-environments/issues/2322#issuecomment-749211076
brew update
brew install sdl2 qt@5 libslirp libarchive
- name: Create build environment
run: mkdir ${{runner.workspace}}/build
- name: Configure
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ If everything went well, melonDS should now be in the `dist` folder.

### macOS:
1. Install the [Homebrew Package Manager](https://brew.sh)
2. Install dependencies: `brew install git pkg-config cmake sdl2 qt5 libslirp libarchive`
2. Install dependencies: `brew install git pkg-config cmake sdl2 qt@5 libslirp libarchive`
3. Compile:
```zsh
git clone https://github.com/Arisotura/melonDS.git
Expand Down

0 comments on commit 8829b05

Please sign in to comment.