Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ vendor/*
result
result/
cmake-build-*
lib/
268 changes: 265 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 14 additions & 5 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,35 @@
nixpkgs.follows = "logos-liblogos/nixpkgs";
logos-cpp-sdk.url = "github:logos-co/logos-cpp-sdk";
logos-liblogos.url = "github:logos-co/logos-liblogos";
# logos-messaging-nim: branch poc/logos-testnet-mix
# Uses git+https (not github:) because the build needs submodules,
# and github: type fetches tarballs which don't include submodule content.
logos-messaging-nim = {
url = "git+https://github.com/logos-messaging/logos-delivery?ref=poc/logos-testnet-mix&submodules=1";
};
};

outputs = { self, nixpkgs, logos-cpp-sdk, logos-liblogos }:
outputs = { self, nixpkgs, logos-cpp-sdk, logos-liblogos, logos-messaging-nim }:
let
systems = [ "aarch64-darwin" "x86_64-darwin" "aarch64-linux" "x86_64-linux" ];
forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f {
pkgs = import nixpkgs { inherit system; };
logosSdk = logos-cpp-sdk.packages.${system}.default;
logosLiblogos = logos-liblogos.packages.${system}.default;
logosMessagingNim = (logos-messaging-nim.packages.${system}.libwaku).overrideAttrs (old: {
NIMFLAGS = (old.NIMFLAGS or "") + " -d:chronicles_colors:none";
});
});
in
{
packages = forAllSystems ({ pkgs, logosSdk, logosLiblogos }:
packages = forAllSystems ({ pkgs, logosSdk, logosLiblogos, logosMessagingNim }:
let
# Common configuration
common = import ./nix/default.nix { inherit pkgs logosSdk logosLiblogos; };
src = ./.;

# Library package (plugin + libwaku)
lib = import ./nix/lib.nix { inherit pkgs common src; };
lib = import ./nix/lib.nix { inherit pkgs common src logosMessagingNim; };

# Include package (generated headers from plugin)
include = import ./nix/include.nix { inherit pkgs common src lib logosSdk; };
Expand All @@ -47,7 +56,7 @@
}
);

devShells = forAllSystems ({ pkgs, logosSdk, logosLiblogos }: {
devShells = forAllSystems ({ pkgs, logosSdk, logosLiblogos, logosMessagingNim }: {
default = pkgs.mkShell {
nativeBuildInputs = [
pkgs.cmake
Expand Down
1 change: 0 additions & 1 deletion lib/README.md

This file was deleted.

Binary file removed lib/libwaku.dylib
Binary file not shown.
Loading