Skip to content

Commit 944fa5a

Browse files
fareMixa84
andauthored
More Nix Update (#42)
* More Nix update * Update README.md --------- Co-authored-by: Mihailo Milenkovic <[email protected]>
1 parent 6cf4b9c commit 944fa5a

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

README-nix.md

+6-11
Original file line numberDiff line numberDiff line change
@@ -59,22 +59,17 @@ that would be used by Nix, you may enter a nix shell as follows:
5959
nix-shell
6060
```
6161

62-
You may then configure with the following command:
63-
```bash
64-
configurePhase
65-
```
66-
67-
And build with this one:
68-
```bash
69-
buildPhase
70-
```
71-
72-
Finally, you can run the tests with:
62+
As with many nix packages, you may then respectively
63+
configure, build or run tests with the following respective commands,
64+
or all of them combined with `&&`:
7365
```bash
66+
configurePhase &&
67+
buildPhase &&
7468
checkPhase
7569
```
7670

7771
The `./src/` directory will have been added to your `PATH`
72+
by the `shell.nix` configuration file,
7873
so you can run commands simply with:
7974
```bash
8075
elements-cli -?

pkgs.nix

+9-3
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,16 @@ stdenv.mkDerivation rec {
7272
"--with-boost-libdir=${boost.out}/lib"
7373
"--disable-bench"
7474
"--enable-any-asset-fees"
75-
] ++ lib.optionals (!doCheck) [
75+
"--without-natpmp"
76+
"--without-upnp"
77+
"--without-zmq"
78+
"--without-usdt"
79+
] ++ (if doCheck then [
80+
"--enable-extended-functional-tests"
81+
] else [
7682
"--disable-tests"
7783
"--disable-gui-tests"
78-
] ++ lib.optionals (!withWallet) [
84+
]) ++ lib.optionals (!withWallet) [
7985
"--disable-wallet"
8086
] ++ lib.optionals withGui [
8187
"--with-gui=qt5"
@@ -88,7 +94,7 @@ stdenv.mkDerivation rec {
8894

8995
nativeCheckInputs = [ python3 ];
9096

91-
doCheck = false;
97+
doCheck = true;
9298

9399
checkFlags =
94100
[ "LC_ALL=en_US.UTF-8" ]

0 commit comments

Comments
 (0)