From 944fa5abe44f718b68d778e127a66645bc24bd49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois-Ren=C3=A9=20Rideau?= <fahree@gmail.com>
Date: Mon, 30 Sep 2024 11:37:33 -0400
Subject: [PATCH] More Nix Update (#42)

* More Nix update

* Update README.md

---------

Co-authored-by: Mihailo Milenkovic <mihailo.milenkovic84@gmail.com>
---
 README-nix.md | 17 ++++++-----------
 pkgs.nix      | 12 +++++++++---
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/README-nix.md b/README-nix.md
index 07f469359f..9611b77044 100644
--- a/README-nix.md
+++ b/README-nix.md
@@ -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 -?
diff --git a/pkgs.nix b/pkgs.nix
index 502d7ec1b1..de9abe36d2 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -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"
@@ -88,7 +94,7 @@ stdenv.mkDerivation rec {
 
   nativeCheckInputs = [ python3 ];
 
-  doCheck = false;
+  doCheck = true;
 
   checkFlags =
     [ "LC_ALL=en_US.UTF-8" ]