nope

Automattic · Jun 23, 2024 · e9c5286 · e9c5286
1 parent dc23b83
commit e9c5286
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/.github/workflows/prebuild.yaml b/.github/workflows/prebuild.yaml
@@ -145,7 +145,7 @@ jobs:
         node: [21]
         canvas_tag: ["v3.0.0-rc2"] # e.g. "v2.6.1"
     name: ${{ matrix.canvas_tag}}, Node.js ${{ matrix.node }}, macOS
-    runs-on: macos-latest
+    runs-on: macos-12 # macos-14+ is M1
     env:
       CANVAS_VERSION_TO_BUILD: ${{ matrix.canvas_tag }}
     steps:

diff --git a/prebuild/macOS/binding.gyp b/prebuild/macOS/binding.gyp
@@ -41,10 +41,10 @@
         '<!(node -p "require(\'node-addon-api\').include_dir")',
         '<!@(pkg-config cairo --cflags-only-I | sed s/-I//g)',
         '<!@(pkg-config libpng --cflags-only-I | sed s/-I//g)',
-        '<!@(pkg-config giflib --cflags-only-I | sed s/-I//g)',
         '<!@(pkg-config pangocairo --cflags-only-I | sed s/-I//g)',
         '<!@(pkg-config freetype2 --cflags-only-I | sed s/-I//g)',
-        '<!@(pkg-config librsvg-2.0 --cflags-only-I | sed s/-I//g)'
+        '<!@(pkg-config librsvg-2.0 --cflags-only-I | sed s/-I//g)',
+        '/opt/homebrew/Cellar/giflib/5.2.2/include'
       ],
       'cflags+': ['-fvisibility=hidden'],
       'xcode_settings': {

diff --git a/prebuild/macOS/preinstall.sh b/prebuild/macOS/preinstall.sh
@@ -12,8 +12,4 @@ rm -f /usr/local/bin/python3-config || :
 # doesn't work to make them ignore conflicts. For now just ignore errors, yolo.
 brew install --force pkg-config cairo pango librsvg giflib || :
 
-pkg-config giflib --cflags-only-I
-brew --cellar giflib
-brew --prefix giflib
-
 pip3 install --user --break-system-packages macpack