diff --git a/README.md b/README.md
index be41950c6..0f2882544 100644
--- a/README.md
+++ b/README.md
@@ -31,12 +31,11 @@ development and testing purposes.
* [Git](https://git-scm.com/downloads)
* [Node.js](https://nodejs.org/en/download/)
* [Yarn](https://yarnpkg.com/en/docs/install)
-* `yarn --add-python-to-path install --global --production windows-build-tools` (Windows only)
### One-time Setup
1. Clone this repo
-2. `DEPS=true ./build.sh`
+2. `./build.sh`
This will download and install the LBRY app and its dependencies, including
[the LBRY daemon](https://github.com/lbryio/lbry) and command line utilities like `node` and `yarn`.
@@ -61,40 +60,10 @@ The app can be run from the sources using the following command:
### On Windows
-#### Windows Dependency
-
-1. Download and install `git` from github.io
- (configure to use command prompt integration)
-2. Download and install `npm` and `node` from
- nodejs.org
-3. Download and install `python 2.7` from
- python.org
-4. Download and Install `Microsoft Visual C++ Compiler for Python 2.7` from
- Microsoft
-5. Download and install `.NET Framework 2.0 Software Development Kit (SDK) (x64)` from
- Microsoft (may need
- to extract setup.exe and install manually by running install.exe as Administrator)
-
#### One-time Setup
-1. Open a command prompt as administrator and run the following:
-
-```
-npm install --global --production windows-build-tools
-exit
-```
-
-2. Open a command prompt in the root of the project and run the following:
-
-```
-python -m pip install -r build\requirements.txt
-npm install -g yarn
-yarn install
-yarn build
-```
-
-3. Download the lbry daemon and CLI [binaries](https://github.com/lbryio/lbry/releases) and place
- them in `static\daemon`.
+Download the lbry daemon and CLI [binaries](https://github.com/lbryio/lbry/releases) and place them
+in `static\daemon`.
### Build
diff --git a/package.json b/package.json
index b12e46b70..41826463d 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
"install": "^0.10.2",
"jayson": "^2.0.2",
"jshashes": "^1.0.7",
- "keytar": "^4.0.3",
+ "keytar-prebuild": "^4.0.4",
"localforage": "^1.5.0",
"npm": "^5.5.1",
"qrcode.react": "^0.7.2",
diff --git a/src/main/index.js b/src/main/index.js
index ad6812c5a..0042f8139 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -5,7 +5,7 @@ import url from 'url';
import Jayson from 'jayson';
import SemVer from 'semver';
import https from 'https';
-import keytar from 'keytar';
+import keytar from 'keytar-prebuild';
import ChildProcess from 'child_process';
import assert from 'assert';
import { app, BrowserWindow, globalShortcut, ipcMain, Menu, Tray } from 'electron';
diff --git a/yarn.lock b/yarn.lock
index 35e76177e..bc55f3292 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5085,11 +5085,12 @@ keypress@0.1.x:
version "0.1.0"
resolved "https://registry.yarnpkg.com/keypress/-/keypress-0.1.0.tgz#4a3188d4291b66b4f65edb99f806aa9ae293592a"
-keytar@^4.0.3:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/keytar/-/keytar-4.1.0.tgz#9e3933e489d656de1a868e1293709313044989d7"
+keytar-prebuild@^4.0.4:
+ version "4.0.4"
+ resolved "https://registry.yarnpkg.com/keytar-prebuild/-/keytar-prebuild-4.0.4.tgz#eb6354c68f2b3609dc325ef8709844632652d602"
dependencies:
- nan "2.5.1"
+ nan "2.7.0"
+ prebuild-install "^2.2.2"
killable@^1.0.0:
version "1.0.0"
@@ -5822,7 +5823,11 @@ mute-stream@0.0.7, mute-stream@~0.0.4:
version "0.0.7"
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
-nan@2.5.1, nan@^2.3.0, nan@^2.3.2:
+nan@2.7.0:
+ version "2.7.0"
+ resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
+
+nan@^2.3.0, nan@^2.3.2:
version "2.5.1"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.1.tgz#d5b01691253326a97a2bbee9e61c55d8d60351e2"
@@ -6937,6 +6942,25 @@ postcss@^6.0.1:
source-map "^0.6.1"
supports-color "^4.4.0"
+prebuild-install@^2.2.2:
+ version "2.4.1"
+ resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-2.4.1.tgz#c28ba1d1eedc17fbd6b3229a657ffc0fba479b49"
+ dependencies:
+ expand-template "^1.0.2"
+ github-from-package "0.0.0"
+ minimist "^1.2.0"
+ mkdirp "^0.5.1"
+ node-abi "^2.1.1"
+ noop-logger "^0.1.1"
+ npmlog "^4.0.1"
+ os-homedir "^1.0.1"
+ pump "^1.0.1"
+ rc "^1.1.6"
+ simple-get "^1.4.2"
+ tar-fs "^1.13.0"
+ tunnel-agent "^0.6.0"
+ xtend "4.0.1"
+
prebuild-install@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-2.3.0.tgz#19481247df728b854ab57b187ce234211311b485"