Skip to content

Commit

Permalink
More Nix Update (#42)
Browse files Browse the repository at this point in the history
* More Nix update

* Update README.md

---------

Co-authored-by: Mihailo Milenkovic <mihailo.milenkovic84@gmail.com>
  • Loading branch information
fare and Mixa84 authored Sep 30, 2024
1 parent 6cf4b9c commit 944fa5a
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
17 changes: 6 additions & 11 deletions README-nix.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,17 @@ that would be used by Nix, you may enter a nix shell as follows:
nix-shell
```

You may then configure with the following command:
```bash
configurePhase
```

And build with this one:
```bash
buildPhase
```

Finally, you can run the tests with:
As with many nix packages, you may then respectively
configure, build or run tests with the following respective commands,
or all of them combined with `&&`:
```bash
configurePhase &&
buildPhase &&
checkPhase
```

The `./src/` directory will have been added to your `PATH`
by the `shell.nix` configuration file,
so you can run commands simply with:
```bash
elements-cli -?
Expand Down
12 changes: 9 additions & 3 deletions pkgs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,16 @@ stdenv.mkDerivation rec {
"--with-boost-libdir=${boost.out}/lib"
"--disable-bench"
"--enable-any-asset-fees"
] ++ lib.optionals (!doCheck) [
"--without-natpmp"
"--without-upnp"
"--without-zmq"
"--without-usdt"
] ++ (if doCheck then [
"--enable-extended-functional-tests"
] else [
"--disable-tests"
"--disable-gui-tests"
] ++ lib.optionals (!withWallet) [
]) ++ lib.optionals (!withWallet) [
"--disable-wallet"
] ++ lib.optionals withGui [
"--with-gui=qt5"
Expand All @@ -88,7 +94,7 @@ stdenv.mkDerivation rec {

nativeCheckInputs = [ python3 ];

doCheck = false;
doCheck = true;

checkFlags =
[ "LC_ALL=en_US.UTF-8" ]
Expand Down

0 comments on commit 944fa5a

Please sign in to comment.