logos-messaging/logos-messaging-nim
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-nim.git synced 2026-02-17 04:13:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

adjust some leftovers

Browse Source
This commit is contained in:
Ivan Folgueira Bande 2026-02-16 09:43:55 +01:00
parent 05f75f7078
commit 31b6a4c744
No known key found for this signature in database
GPG Key ID: 3C117481F89E24A7
5 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -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/$@" && \

3
flake.nix
View File

@ -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;

2
nix/default.nix
View File

@ -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}";

4
nix/deps.nix
View File

@ -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";
}

12
waku.nimble
View File

@ -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"