From 31b6a4c744548761a7e914d676b08a2f499e64cb Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande <ivansete@status.im>
Date: Mon, 16 Feb 2026 09:43:55 +0100
Subject: [PATCH] adjust some leftovers

---
 Makefile        |  6 +++---
 flake.nix       |  3 ++-
 nix/default.nix |  2 --
 nix/deps.nix    |  4 ++--
 waku.nimble     | 12 ++++++------
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index ff15a9381..e550afc72 100644
--- a/Makefile
+++ b/Makefile
@@ -377,9 +377,9 @@ else
 detected_OS := $(shell uname -s)
 endif
 
-BUILD_COMMAND ?= libsdsDynamic
+BUILD_COMMAND ?= libwakuDynamic
 ifeq ($(STATIC), 1)
-	BUILD_COMMAND = libsdsStatic
+	BUILD_COMMAND = libwakuStatic
 endif
 
 ifeq ($(detected_OS),Windows)
@@ -392,7 +392,7 @@ else ifeq ($(detected_OS),Linux)
 endif
 
 libwaku: |
-	nimble --verbose $(BUILD_COMMAND) $(NIM_PARAMS) --noNimblePath waku.nimble
+	nimble --verbose $(BUILD_COMMAND) $(NIM_PARAMS) waku.nimble
 
 cwaku_example: | build libwaku
 	echo -e $(BUILD_MSG) "build/$@" && \
diff --git a/flake.nix b/flake.nix
index 811ba50bf..950571307 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,6 +9,7 @@
   inputs = {
     # Pinned nixpkgs commit
     nixpkgs.url = "github:NixOS/nixpkgs?rev=f44bd8ca21e026135061a0a57dcf3d0775b67a49";
+    #nixpkgs.url = "github:NixOS/nixpkgs?rev=23d72dabcb3b12469f57b37170fcbc1789bd7457";
 
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
@@ -41,7 +42,7 @@
             allowUnfree = true;
           };
           overlays = [
-            rust-overlay.overlays.default
+            (import rust-overlay)
             (final: prev: {
               androidEnvCustom = prev.callPackage ./nix/pkgs/android-sdk { };
               androidPkgs = final.androidEnvCustom.pkgs;
diff --git a/nix/default.nix b/nix/default.nix
index ef9035ef3..808b8864e 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -36,10 +36,8 @@ in stdenv.mkDerivation {
 
   buildInputs = with pkgs; [
     openssl gmp zip bash nim nimble cacert
-    git cmake cargo-make rustup
   ];
 
-  # Dependencies that should only exist in the build environment.
   nativeBuildInputs = let
     # Fix for Nim compiler calling 'git rev-parse' and 'lsb_release'.
     fakeGit = writeScriptBin "git" "echo ${version}";
diff --git a/nix/deps.nix b/nix/deps.nix
index 4f4c38a0a..4c43efa49 100644
--- a/nix/deps.nix
+++ b/nix/deps.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   inherit src;
 
   nativeBuildInputs = with pkgs; [
-    jq rsync git nim nimble cacert moreutils which
+    jq rsync git nim nimble cacert moreutils xz
   ];
 
   configurePhase = ''
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
   '';
 
   # Make this a fixed-output derivation to allow internet access for Nimble.
-  outputHash = "sha256-+INiCNg51bT4p7oL8+Hr+1pVJu5GDz8L1zAOyjS/Y8o=";
+  outputHash = "sha256-ly8FGylvbZxQPYaCR3IUJgF9GMYkJrlNZqNxZCyqupE=";
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
 }
diff --git a/waku.nimble b/waku.nimble
index 11c06aef8..3135b4476 100644
--- a/waku.nimble
+++ b/waku.nimble
@@ -123,7 +123,7 @@ proc getArch(): string =
   let (archFromUname, _) = gorgeEx("uname -m")
   return $archFromUname
 
-task libsdsDynamicWindows, "Generate bindings":
+task libwakuDynamicWindows, "Generate bindings":
   let outLibNameAndExt = "libwaku.dll"
   let name = "libwaku"
   buildLibrary outLibNameAndExt,
@@ -131,7 +131,7 @@ task libsdsDynamicWindows, "Generate bindings":
     """-d:chronicles_line_numbers --warning:Deprecated:off --warning:UnusedImport:on -d:chronicles_log_level=TRACE """,
     "dynamic"
 
-task libsdsDynamicLinux, "Generate bindings":
+task libwakuDynamicLinux, "Generate bindings":
   let outLibNameAndExt = "libwaku.so"
   let name = "libwaku"
   buildLibrary outLibNameAndExt,
@@ -139,7 +139,7 @@ task libsdsDynamicLinux, "Generate bindings":
     """-d:chronicles_line_numbers --warning:Deprecated:off --warning:UnusedImport:on -d:chronicles_log_level=TRACE """,
     "dynamic"
 
-task libsdsDynamicMac, "Generate bindings":
+task libwakuDynamicMac, "Generate bindings":
   let outLibNameAndExt = "libwaku.dylib"
   let name = "libwaku"
 
@@ -152,7 +152,7 @@ task libsdsDynamicMac, "Generate bindings":
     archFlags & " -d:chronicles_line_numbers --warning:Deprecated:off --warning:UnusedImport:on -d:chronicles_log_level=TRACE",
     "dynamic"
 
-task libsdsStaticWindows, "Generate bindings":
+task libwakuStaticWindows, "Generate bindings":
   let outLibNameAndExt = "libwaku.lib"
   let name = "libwaku"
   buildLibrary outLibNameAndExt,
@@ -160,7 +160,7 @@ task libsdsStaticWindows, "Generate bindings":
     """-d:chronicles_line_numbers --warning:Deprecated:off --warning:UnusedImport:on -d:chronicles_log_level=TRACE """,
     "static"
 
-task libsdsStaticLinux, "Generate bindings":
+task libwakuStaticLinux, "Generate bindings":
   let outLibNameAndExt = "libwaku.a"
   let name = "libwaku"
   buildLibrary outLibNameAndExt,
@@ -168,7 +168,7 @@ task libsdsStaticLinux, "Generate bindings":
     """-d:chronicles_line_numbers --warning:Deprecated:off --warning:UnusedImport:on -d:chronicles_log_level=TRACE """,
     "static"
 
-task libsdsStaticMac, "Generate bindings":
+task libwakuStaticMac, "Generate bindings":
   let outLibNameAndExt = "libwaku.a"
   let name = "libwaku"