Updated

STFC-ICD-Research-and-Design · Oct 12, 2023 · 4fc24d0 · 4fc24d0
1 parent dd7be19
commit 4fc24d0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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 = ''
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,7 @@ @@
                 zlib
                 zstd
                 rdkafka
+                tdengine
               ]) ++ pkgs.lib.optionals pkgs.stdenv.isDarwin (with pkgs; [ libiconv ]);
             };
           });
@@ Expand Down @@