Point to lssa's base branch's flake. Minor improvements.

This commit is contained in:
Alejandro Cabeza Romero 2026-02-13 12:42:31 +01:00
parent dc12ee382e
commit b643d3502e
No known key found for this signature in database
GPG Key ID: DA3D14AE478030FD
2 changed files with 14 additions and 14 deletions

7
flake.lock generated
View File

@ -350,16 +350,15 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1770727084, "lastModified": 1770907667,
"narHash": "sha256-zwbeHgqYLA0KxInX6nXhlPef5UExLzpEac+phGpXF3w=", "narHash": "sha256-HclY4daI8MvVGNmC+SWsrqobeYx0B6l/PB2NKG//Kj8=",
"owner": "logos-blockchain", "owner": "logos-blockchain",
"repo": "lssa", "repo": "lssa",
"rev": "042854653c3493a6f5e7c89481b2d521e673bb38", "rev": "cb6fb881ace809bd452f2b8cab83802af68b9a56",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "logos-blockchain", "owner": "logos-blockchain",
"ref": "feat/nixify",
"repo": "lssa", "repo": "lssa",
"type": "github" "type": "github"
} }

View File

@ -7,7 +7,7 @@
logos-liblogos.url = "github:logos-co/logos-liblogos"; logos-liblogos.url = "github:logos-co/logos-liblogos";
logos-core.url = "github:logos-co/logos-cpp-sdk"; logos-core.url = "github:logos-co/logos-cpp-sdk";
logos-execution-zone.url = "github:logos-blockchain/lssa?ref=feat/nixify"; logos-execution-zone.url = "github:logos-blockchain/lssa";
logos-module-viewer.url = "github:logos-co/logos-module-viewer"; logos-module-viewer.url = "github:logos-co/logos-module-viewer";
}; };
@ -45,7 +45,7 @@
logosCore = logos-core.packages.${system}.default; logosCore = logos-core.packages.${system}.default;
logosExecutionZoneWalletPackage = logos-execution-zone.packages.${system}.wallet; logosExecutionZoneWalletPackage = logos-execution-zone.packages.${system}.wallet;
logosExecutionZoneModulePackage = pkgs.stdenv.mkDerivation { logosExecutionZoneWalletModulePackage = pkgs.stdenv.mkDerivation {
pname = "logos-execution-zone-module"; pname = "logos-execution-zone-module";
version = "dev"; version = "dev";
src = ./.; src = ./.;
@ -82,9 +82,8 @@
}; };
in in
{ {
lib = logosExecutionZoneModulePackage; lib = logosExecutionZoneWalletModulePackage;
module = logosExecutionZoneModulePackage; default = logosExecutionZoneWalletModulePackage;
default = logosExecutionZoneModulePackage;
} }
); );
@ -92,21 +91,23 @@
system: system:
let let
pkgs = mkPkgs system; pkgs = mkPkgs system;
logosExecutionZoneModulePackage = self.packages.${system}.module; logosExecutionZoneWalletModuleLib = self.packages.${system}.lib;
logosModuleViewerPackage = logos-module-viewer.packages.${system}.default; logosModuleViewerPackage = logos-module-viewer.packages.${system}.default;
extension = if pkgs.stdenv.isDarwin then "dylib" extension = if pkgs.stdenv.isDarwin then "dylib"
else if pkgs.stdenv.hostPlatform.isWindows then "dll" else if pkgs.stdenv.hostPlatform.isWindows then "dll"
else "so"; else "so";
in inspectModule = {
{
default = {
type = "app"; type = "app";
program = program =
"${pkgs.writeShellScriptBin "inspect-module" '' "${pkgs.writeShellScriptBin "inspect-module" ''
exec ${logosModuleViewerPackage}/bin/logos-module-viewer \ exec ${logosModuleViewerPackage}/bin/logos-module-viewer \
--module ${logosExecutionZoneModulePackage}/lib/liblogos-execution-zone-wallet-module.${extension} --module ${logosExecutionZoneWalletModuleLib}/lib/liblogos-execution-zone-wallet-module.${extension}
''}/bin/inspect-module"; ''}/bin/inspect-module";
}; };
in
{
inspect-module = inspectModule;
default = inspectModule;
} }
); );