Skip to content

Commit e9c5286

Browse files
committed
nope
1 parent dc23b83 commit e9c5286

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

.github/workflows/prebuild.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ jobs:
145145
node: [21]
146146
canvas_tag: ["v3.0.0-rc2"] # e.g. "v2.6.1"
147147
name: ${{ matrix.canvas_tag}}, Node.js ${{ matrix.node }}, macOS
148-
runs-on: macos-latest
148+
runs-on: macos-12 # macos-14+ is M1
149149
env:
150150
CANVAS_VERSION_TO_BUILD: ${{ matrix.canvas_tag }}
151151
steps:

prebuild/macOS/binding.gyp

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141
'<!(node -p "require(\'node-addon-api\').include_dir")',
4242
'<!@(pkg-config cairo --cflags-only-I | sed s/-I//g)',
4343
'<!@(pkg-config libpng --cflags-only-I | sed s/-I//g)',
44-
'<!@(pkg-config giflib --cflags-only-I | sed s/-I//g)',
4544
'<!@(pkg-config pangocairo --cflags-only-I | sed s/-I//g)',
4645
'<!@(pkg-config freetype2 --cflags-only-I | sed s/-I//g)',
47-
'<!@(pkg-config librsvg-2.0 --cflags-only-I | sed s/-I//g)'
46+
'<!@(pkg-config librsvg-2.0 --cflags-only-I | sed s/-I//g)',
47+
'/opt/homebrew/Cellar/giflib/5.2.2/include'
4848
],
4949
'cflags+': ['-fvisibility=hidden'],
5050
'xcode_settings': {

prebuild/macOS/preinstall.sh

-4
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,4 @@ rm -f /usr/local/bin/python3-config || :
1212
# doesn't work to make them ignore conflicts. For now just ignore errors, yolo.
1313
brew install --force pkg-config cairo pango librsvg giflib || :
1414

15-
pkg-config giflib --cflags-only-I
16-
brew --cellar giflib
17-
brew --prefix giflib
18-
1915
pip3 install --user --break-system-packages macpack

0 commit comments

Comments
 (0)