fix: update nix to be able to run the standalone app again

This commit is contained in:
Khushboo Mehta 2026-02-25 15:25:00 +01:00
parent 2a5913f676
commit f2ec9d3b6e
3 changed files with 938 additions and 28 deletions

932
flake.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -9,9 +9,11 @@
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";
nix-bundle-lgx.url = "github:logos-co/nix-bundle-lgx";
logos-package-manager.url = "github:logos-co/logos-package-manager-module";
};
outputs = { self, nixpkgs, logos-cpp-sdk, logos-liblogos, logos-execution-zone-module, logos-capability-module, logos-design-system }:
outputs = { self, nixpkgs, logos-cpp-sdk, logos-liblogos, logos-execution-zone-module, logos-capability-module, logos-design-system, nix-bundle-lgx, logos-package-manager }:
let
systems = [ "aarch64-darwin" "x86_64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-windows" ];
forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f {
@ -21,10 +23,12 @@
logosExecutionZoneModule = logos-execution-zone-module.packages.${system}.default;
logosCapabilityModule = logos-capability-module.packages.${system}.default;
logosDesignSystem = logos-design-system.packages.${system}.default;
lgxBundler = nix-bundle-lgx.bundlers.${system}.default;
lgpm = logos-package-manager.packages.${system}.cli;
});
in
{
packages = forAllSystems ({ pkgs, logosSdk, logosLiblogos, logosExecutionZoneModule, logosCapabilityModule, logosDesignSystem }:
packages = forAllSystems ({ pkgs, logosSdk, logosLiblogos, logosExecutionZoneModule, logosCapabilityModule, logosDesignSystem, lgxBundler, lgpm }:
let
common = import ./nix/default.nix {
inherit pkgs logosSdk logosLiblogos;
@ -35,8 +39,11 @@
inherit pkgs common src logosExecutionZoneModule;
};
logosCapabilityModuleLgx = lgxBundler logosCapabilityModule;
logosExecutionZoneModuleLgx = lgxBundler logosExecutionZoneModule;
app = import ./nix/app.nix {
inherit pkgs common src logosLiblogos logosExecutionZoneModule logosCapabilityModule logosDesignSystem;
inherit pkgs common src logosLiblogos logosExecutionZoneModule logosCapabilityModule logosDesignSystem lgpm logosCapabilityModuleLgx logosExecutionZoneModuleLgx;
logosExecutionZoneWalletUI = lib;
};
in
@ -56,7 +63,7 @@
};
});
devShells = forAllSystems ({ pkgs, logosSdk, logosLiblogos, logosExecutionZoneModule, logosCapabilityModule, logosDesignSystem }: {
devShells = forAllSystems ({ pkgs, logosSdk, logosLiblogos, logosExecutionZoneModule, logosCapabilityModule, logosDesignSystem, lgpm, ... }: {
default = pkgs.mkShell {
nativeBuildInputs = [
pkgs.cmake

View File

@ -1,5 +1,5 @@
# Builds the logos-execution-zone-wallet-ui-app standalone application
{ pkgs, common, src, logosLiblogos, logosExecutionZoneModule, logosCapabilityModule, logosExecutionZoneWalletUI, logosDesignSystem }:
{ pkgs, common, src, logosLiblogos, logosExecutionZoneModule, logosCapabilityModule, logosExecutionZoneWalletUI, logosDesignSystem, lgpm, logosCapabilityModuleLgx, logosExecutionZoneModuleLgx }:
pkgs.stdenv.mkDerivation rec {
pname = "logos-execution-zone-wallet-ui-app";
@ -144,15 +144,14 @@ pkgs.stdenv.mkDerivation rec {
MINGW*|MSYS*|CYGWIN*) OS_EXT="dll";;
esac
if [ -f "${logosCapabilityModule}/lib/capability_module_plugin.$OS_EXT" ]; then
cp -L "${logosCapabilityModule}/lib/capability_module_plugin.$OS_EXT" "$out/modules/"
fi
if [ -f "${logosExecutionZoneModule}/lib/liblogos_execution_zone_wallet_module.$OS_EXT" ]; then
cp -L "${logosExecutionZoneModule}/lib/liblogos_execution_zone_wallet_module.$OS_EXT" "$out/modules/"
fi
if [ -f "${logosExecutionZoneModule}/lib/libwallet_ffi.$OS_EXT" ]; then
cp -L "${logosExecutionZoneModule}/lib/libwallet_ffi.$OS_EXT" "$out/modules/"
fi
for lgxFile in ${logosCapabilityModuleLgx}/*.lgx; do
echo "Installing $lgxFile via lgpm..."
${lgpm}/bin/lgpm --modules-dir "$out/modules" install --file "$lgxFile"
done
for lgxFile in ${logosExecutionZoneModuleLgx}/*.lgx; do
echo "Installing $lgxFile via lgpm..."
${lgpm}/bin/lgpm --modules-dir "$out/modules" install --file "$lgxFile"
done
if [ -f "${logosExecutionZoneWalletUI}/lib/logos_execution_zone_wallet_ui.$OS_EXT" ]; then
cp -L "${logosExecutionZoneWalletUI}/lib/logos_execution_zone_wallet_ui.$OS_EXT" "$out/"