fix: Update macOS x64 build dependencies and pkg-config paths

p2panda · Dec 7, 2024 · f29196b · f29196b
1 parent cce6bbe
commit f29196b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -72,7 +72,12 @@ jobs:
             # Install x86_64 versions for Intel builds
             arch -x86_64 /usr/local/bin/brew install pkg-config gtk4 pango cairo gdk-pixbuf at-spi2-core graphene libadwaita || true
             arch -x86_64 /usr/local/bin/brew upgrade pkg-config gtk4 pango cairo gdk-pixbuf at-spi2-core graphene libadwaita || true
-            echo "PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/opt/gdk-pixbuf/lib/pkgconfig:/usr/local/opt/pango/lib/pkgconfig:/usr/local/opt/cairo/lib/pkgconfig:/usr/local/opt/graphene/lib/pkgconfig:/usr/local/Cellar/gdk-pixbuf/*/lib/pkgconfig" >> $GITHUB_ENV
+            
+            # Set pkg-config path for x86_64
+            echo "PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/opt/pango/lib/pkgconfig:/usr/local/opt/cairo/lib/pkgconfig:/usr/local/opt/gdk-pixbuf/lib/pkgconfig:/usr/local/opt/graphene/lib/pkgconfig:/usr/local/opt/libffi/lib/pkgconfig:/usr/local/opt/gtk4/lib/pkgconfig:/usr/local/opt/libadwaita/lib/pkgconfig" >> $GITHUB_ENV
+            
+            # Ensure brew links are correct
+            arch -x86_64 /usr/local/bin/brew link --force pango cairo gdk-pixbuf gtk4 libadwaita
           else
             # Install ARM64 versions for Apple Silicon builds
             brew install pkg-config gtk4 pango cairo gdk-pixbuf at-spi2-core graphene libadwaita || true