nope

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

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/prebuild.yaml b/.github/workflows/prebuild.yaml
@@ -169,6 +169,7 @@ jobs:
  npm install --ignore-scripts
  . prebuild/macOS/preinstall.sh
  cp prebuild/macOS/binding.gyp binding.gyp
+ export PKG_CONFIG_PATH=/opt/X11/lib/pkgconfig
  node-gyp rebuild -j 2
  . prebuild/macOS/bundle.sh
 

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
@@ -10,10 +10,8 @@ rm -f /usr/local/bin/python3-config || :
 
 # two or more of these packages have python3 as a dependency, and --overwrite
 # doesn't work to make them ignore conflicts. For now just ignore errors, yolo.
-brew install --force pkg-config cairo pango librsvg giflib || :
+brew install --force pkg-config cairo pango librsvg jpeg giflib || :
 
-pkg-config giflib --cflags-only-I
-brew --cellar giflib
-brew --prefix giflib
+pkg-config --cflags --libs jpeg || :
 
 pip3 install --user --break-system-packages macpack