From ef4b604caf09e7f88fd7ba0263218e1b06e758ad Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 12 Jul 2016 23:10:53 +0100
Subject: [PATCH] webpack: always use the olm from vector-web

Fixes an error when matrix-js-sdk is symlinked into node_modules, which meant
that we would (try to) use the version of olm from js-sdk instead of
vector-web (https://github.com/vector-im/vector-web/issues/1765).
---
 webpack.config.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/webpack.config.js b/webpack.config.js
index 78282d1880..91d0564c47 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -43,6 +43,10 @@ module.exports = {
 
             // same goes for js-sdk
             "matrix-js-sdk": path.resolve('./node_modules/matrix-js-sdk'),
+
+            // make sure we use the version of olm from vector-web rather than
+            // js-sdk.
+            "olm": path.resolve('./node_modules/olm'),
         },
     },
     plugins: [