From e06242f49a25dcda8df89fac218142c5a96ac302 Mon Sep 17 00:00:00 2001 From: danielSanchezQ <3danimanimal@gmail.com> Date: Thu, 26 Feb 2026 13:03:59 +0000 Subject: [PATCH] Fix circuits loading --- flake.lock | 13 +++++++------ flake.nix | 2 +- nix/app.nix | 4 ++-- nix/lib.nix | 4 ++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 51164bc..7604296 100644 --- a/flake.lock +++ b/flake.lock @@ -68,15 +68,16 @@ ] }, "locked": { - "lastModified": 1772023717, - "narHash": "sha256-aFzRBR3CVosBOqQeYCB1tz7Vp/rkDYLtAvqgQjTdE4c=", + "lastModified": 1772110897, + "narHash": "sha256-5avo4LCEpQrA076qTUXPJXPhwOZ0Ma96p04qT1vSve0=", "owner": "logos-blockchain", "repo": "logos-blockchain-module", - "rev": "1320bd760ffe9c3cc2d8c11f76d8296b01faeef9", + "rev": "e232c54330db366a184f5a51aefbb1fd75d43d18", "type": "github" }, "original": { "owner": "logos-blockchain", + "ref": "share-output", "repo": "logos-blockchain-module", "type": "github" } @@ -594,11 +595,11 @@ ] }, "locked": { - "lastModified": 1772034067, - "narHash": "sha256-gHRlOZoBvNne7A8gP7+YH8WNas50mIgJGP/ZZzhCyLo=", + "lastModified": 1772100797, + "narHash": "sha256-IGf1mWOiQZfBWxkIlwUPGogSDHuKyBEBUgUNx0dYFEs=", "owner": "logos-co", "repo": "logos-design-system", - "rev": "b3d5bda6765dace3a5aeefe9da74d8298490681b", + "rev": "e0101f17e38eebee5a551651206d371e5b0bc647", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4af8968..128ab16 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ nixpkgs.follows = "logos-liblogos/nixpkgs"; logos-cpp-sdk.url = "github:logos-co/logos-cpp-sdk"; logos-liblogos.url = "github:logos-co/logos-liblogos?rev=e3741c01fd3abf6b7bd9ff2fa8edf89c41fc0cea"; - logos-blockchain-module.url = "github:logos-blockchain/logos-blockchain-module"; + logos-blockchain-module.url = "github:logos-blockchain/logos-blockchain-module?ref=share-output"; logos-capability-module.url = "github:logos-co/logos-capability-module"; logos-design-system.url = "github:logos-co/logos-design-system"; logos-design-system.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/nix/app.nix b/nix/app.nix index 8662316..d77c553 100644 --- a/nix/app.nix +++ b/nix/app.nix @@ -174,8 +174,8 @@ pkgs.stdenv.mkDerivation rec { fi # Copy circuits from blockchain module to lib (needed at runtime) - if [ -d "${logosBlockchainModule}/lib/circuits" ]; then - cp -r "${logosBlockchainModule}/lib/circuits" "$out/modules/" + if [ -d "${logosBlockchainModule}/share/circuits" ]; then + cp -r "${logosBlockchainModule}/share/circuits" "$out/modules/" fi # Copy blockchain_ui Qt plugin to root directory (not modules, as it's loaded differently) diff --git a/nix/lib.nix b/nix/lib.nix index b1d8f1c..42a91e6 100644 --- a/nix/lib.nix +++ b/nix/lib.nix @@ -42,8 +42,8 @@ pkgs.stdenv.mkDerivation { fi # Copy circuits from blockchain module so result/lib/circuits is available - if [ -d "${logosBlockchainModule}/lib/circuits" ]; then - cp -r "${logosBlockchainModule}/lib/circuits" $out/modules/ + if [ -d "${logosBlockchainModule}/share/circuits" ]; then + cp -r "${logosBlockchainModule}/share/circuits" $out/modules/ fi runHook postInstall