Ensure brew-installed vips can be detected #3239

lovell · lovell · commit 48e3ea5e29b9 · 2022-05-26T22:58:24.000+01:00
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -4,6 +4,11 @@
 
 Requires libvips v8.12.2
 
+### v0.30.6 - TBD
+
+* Ensure brew-installed `vips` can be detected (regression in 0.30.5).
+  [#3239](https://github.com/lovell/sharp/issues/3239)
+
 ### v0.30.5 - 23rd May 2022
 
 * Install: pass `PKG_CONFIG_PATH` via env rather than substitution.
diff --git a/lib/libvips.js b/lib/libvips.js
@@ -68,6 +68,7 @@ const globalLibvipsVersion = function () {
     const globalLibvipsVersion = spawnSync('pkg-config --modversion vips-cpp', {
       ...spawnSyncOptions,
       env: {
+        ...env,
         PKG_CONFIG_PATH: pkgConfigPath()
       }
     }).stdout;

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ const globalLibvipsVersion = function () {`
`68`	`68`	`const globalLibvipsVersion = spawnSync('pkg-config --modversion vips-cpp', {`
`69`	`69`	`...spawnSyncOptions,`
`70`	`70`	`env: {`
	`71`	`+ ...env,`
`71`	`72`	`PKG_CONFIG_PATH: pkgConfigPath()`
`72`	`73`	`}`
`73`	`74`	`}).stdout;`