From fd2a2f25ad392595400c626e732ca7225f4c565d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 21 Oct 2016 14:54:14 +0100
Subject: [PATCH] OK, we;ll use the standard icon paths

but with a different 'build' directory
---
 electron/{icons/AppIcon.icns => build/icon.icns} | Bin
 electron/build/icon.ico                          | Bin 0 -> 4286 bytes
 package.json                                     |  10 ++--------
 3 files changed, 2 insertions(+), 8 deletions(-)
 rename electron/{icons/AppIcon.icns => build/icon.icns} (100%)
 create mode 100644 electron/build/icon.ico

diff --git a/electron/icons/AppIcon.icns b/electron/build/icon.icns
similarity index 100%
rename from electron/icons/AppIcon.icns
rename to electron/build/icon.icns
diff --git a/electron/build/icon.ico b/electron/build/icon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..1b40e1747a4fb5c4d6ad347137f31318cc7f2e1b
GIT binary patch
literal 4286
zcmb`K&ubGw6vwxU6cMQ)cxWpYy$A~8Q9S6s;K7UFK@>cS*Z%%psoI~~+Q!yKvq{>f
zo21!*Eov)j)aa>#AYO{pDoV8|me|sc-?y73o5^H%Oq=k{{MecIdGF26>_$<F@U5s&
z=vN8uQIvg(q8x_MrJRPS-}vBKa=?_?A^!Eft}2B(phajM`VM)ZL*g0Pz40o&0=ffz
zgEpYAP!Cj|Ju<fi2C+4017e(J(LR_vE7JqUerOtEoXC$T<mdzJQ`{6Y&$imPaBW+L
zn5n^bF+_3mY^%MFYu%X{xi#2caA1=UA0c53uzeo-<G?3B7IUeY9@ut@o%l=8vCIs!
z2D?Y04=!xtuk&;5ZP>Q*oUi<WF~{w5U~@M#D#0fHl6@{;FOYu)c2_0&UY==h|1TfR
z6VQSrdk*7{*m-<ig8vg^PI}*8-5Ks1DTlo&N%k*{JInL<wgi6-W9FcQHZc4yUa7B1
z^1Co@2hZc%5`5-MR<cq3I@22>*1mQt6JVF|EK%E)pR8j3rwuH6Bgo>FaW^j0YbRG?
zt)Vj_mZ(pLAM*8qo%f8(@+ow`pUx8xa)zgm`^Sy1CTdu;Q+1CWxruc9nEJeq&JpsV
z9oqEzlfB9IQD;7K6Km2~@L`*AucTx8jnZ`;(qr?Tea!c=nnijaIP<GxY&_TtcFtKk
z1N(cOR>75zdw(p{#o}NH_Z{+%bAi!132d#P@7$*Ncs`JA&2!iEf%bq+(VGG0f6`>n
zJMYKXX89DCny6*tV?8X=rLxIu<HmlR7#U#x*+x;`?LN$J1>eXm)`D`OKC5Tyi&~SB
zyXJN_)mOKS@BXaj*+yHMPq83ILj|&oJY~;abLA8FRkd*+1*h6r;Bm9D@3zQ~&yIY=
zOZP9HZ7kNTF}*HooF(DgUKW^cb-TBO`Q~z<JMoE4d&t~V=`)_rdh9W}&rKh&CfPZa
zZU4o*%T9c4a9Dh<&^tAqE&cb5wJDJQ7V{jR!+K-bfsb>&WkP0;i}FFSUv!F{uHjsz
z{|I?~pm&bIqn1MUgctl>68!w{lE^>aC5-nE!Lvmav(*;|Tlk-a_a|Nx>p=YC9DuJ4
zc`TbUWeQx1+i}h9K48C<VhzIZf&MRMtpmMx_-9<tck+wY`VDjea?QD&Pj%#=3_f&%
z|AqX}8^TN*97?nE?mc3Df}+qRsFb%WYNtw4CCkP5Zl6zU7G-@}O7XIyl%#b4<td0t
RtB<bB%9>-@sY@wE>>s&hK41U<

literal 0
HcmV?d00001

diff --git a/package.json b/package.json
index bd9ce5cf76..586bff1340 100644
--- a/package.json
+++ b/package.json
@@ -122,16 +122,10 @@
       "electron/src/**",
       "vector/**",
       "package.json"
-    ],
-    "mac": {
-      "target": "dmg",
-      "icon": "electron/icons/AppIcon.icns"
-    },
-    "dmg": {
-      "icon": "electron/icons/AppIcon.icns"
-    }
+    ]
   },
   "directories": {
+    "buildResources": "electron/build",
     "output": "electron/dist"
   }
 }