From 4fc24d0aa268856a8d0165dc590cc7f5875887b0 Mon Sep 17 00:00:00 2001
From: Daniel Kirk <daniel.kirk@stfc.ac.uk>
Date: Thu, 12 Oct 2023 08:48:40 +0000
Subject: [PATCH] Updated

---
 .github/workflows/ci.yml      |  2 +-
 flake.nix                     |  1 +
 overlays/tdengine/default.nix | 13 +++++--------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 25d3bc97..0830a50b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
         run: nix develop --command cargo fmt -- --check
 
       - name: Clippy
-        run: nix develop --command printenv; cargo clippy --all-targets --no-deps -- -Dwarnings
+        run: nix develop --command cargo clippy --all-targets --no-deps -- -Dwarnings
 
       - name: Build
         run: nix develop --command cargo build --all
diff --git a/flake.nix b/flake.nix
index 707536f5..5dc3d0f7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,6 +28,7 @@
             zlib
             zstd
             rdkafka
+            tdengine
           ]) ++ pkgs.lib.optionals pkgs.stdenv.isDarwin (with pkgs; [ libiconv ]);
         };
       });
diff --git a/overlays/tdengine/default.nix b/overlays/tdengine/default.nix
index 1cdd8d17..2e9d200a 100644
--- a/overlays/tdengine/default.nix
+++ b/overlays/tdengine/default.nix
@@ -18,19 +18,16 @@ stdenv.mkDerivation {
   dontUseCmakeConfigure=true;
 
   nativeBuildInputs = with nixpkgs; [
-    cjson
-    lz4
+    cacert
     git
+    pkg-config
+    xz
+    jansson
     cmake
   ];
 
   buildPhase = ''
-    mkdir debug
-    cd debug
-    cmake .. -DBUILD_TOOLS=false -DBUILD_HTTP=true
-    ls
-    make
-    ls -f
+    ./build.sh
   '';
   
   installPhase = ''