The geology-centered conception of terroir in wine that you're giving is actually rather controversial and not generally supported by any science we've done to date.

For wine, "terroir" rather encompasses things like climate, local customs and practices (viticulture and vinification), and sometimes things like local strains of grapes or of yeast.