-
-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore(readme): small improvements for NixOS users
- Loading branch information
Showing
1 changed file
with
13 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,14 +38,18 @@ In case you have installed Trezor Bridge previously there will be a port conflic | |
| #### Prerequisites | ||
|
|
||
| You need: | ||
| - Docker (to run NixOS in a container). | ||
| - Docker (to run NixOS in a container). | ||
| - xhost | ||
|
|
||
| On NixOS, simply enter the `nix-shell`, it is all there. | ||
|
|
||
| #### Run it | ||
|
|
||
| 1. Run in terminal: `xhost +` | ||
| 2. Download the latest docker build: `docker-compose -f ./docker/compose.yml pull trezor-user-env-unix` | ||
| 3. Run it: `docker-compose -f ./docker/compose.yml up trezor-user-env-unix` | ||
| 4. Open http://localhost:9002. | ||
| 1. Clone this repo `git clone [email protected]:trezor/trezor-user-env.git`. If on NixOS, enter `nix-shell`. | ||
| 2. Run in terminal: `xhost +` | ||
| 3. Download the latest docker build: `docker-compose -f ./docker/compose.yml pull trezor-user-env-unix` | ||
| 4. Run it: `docker-compose -f ./docker/compose.yml up trezor-user-env-unix` | ||
| 5. Open http://localhost:9002. | ||
|
|
||
| For a future use you can omit the second step and run `up` (the third step) directly. **However, you will not have the latest master builds then!** | ||
|
|
||
|
|
@@ -66,9 +70,10 @@ Download these as you are used to. We recommend using `nix` or `brew`, but that' | |
| 1. Run XQuartz and leave it running on the background. Wait till it is launched. | ||
| 2. In XQuartz settings go to Preferences > Security and enable "Allow connections from network clients". | ||
| 3. Open a new terminal window (not in XQuartz) and add yourself to the X access control list: `xhost +127.0.0.1` (you will probably need to logout/login after XQuartz installation to have `xhost` command available) | ||
| 4. Download the latest docker build: `docker-compose -f ./docker/compose.yml pull trezor-user-env-mac` | ||
| 5. Run it: `docker-compose -f ./docker/compose.yml up trezor-user-env-mac` | ||
| 6. Open http://localhost:9002. | ||
| 4. Clone this repo `git clone [email protected]:trezor/trezor-user-env.git`. | ||
| 5. Download the latest docker build: `docker-compose -f ./docker/compose.yml pull trezor-user-env-mac` | ||
| 6. Run it: `docker-compose -f ./docker/compose.yml up trezor-user-env-mac` | ||
| 7. Open http://localhost:9002. | ||
|
|
||
| For a future use you can omit the second step and run `up` (the third step) directly. **However, you will not have the latest master builds then!** | ||
|
|
||
|
|
||