From 27cd79efdd289a34a8c6ed357188a856de63673d Mon Sep 17 00:00:00 2001 From: Ricardo Guilherme Schmidt <3esmit@gmail.com> Date: Wed, 15 Jul 2026 20:34:13 -0300 Subject: [PATCH] fix(amm-ui): stabilize standalone flake outputs Skip compiled wallet packaging for generation-only outputs and normalize the relative shared-wallet lock entry. Document the supported macOS architecture accurately. --- apps/amm/MACOS.md | 8 +++++--- apps/amm/README.md | 4 ++-- apps/amm/flake.lock | 5 ++--- apps/amm/flake.nix | 12 +++++++----- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/apps/amm/MACOS.md b/apps/amm/MACOS.md index 82dcc8a..58359a1 100644 --- a/apps/amm/MACOS.md +++ b/apps/amm/MACOS.md @@ -1,8 +1,10 @@ # AMM UI on macOS -The AMM UI supports both Apple Silicon and Intel Macs through the Nix flake. -The project packages its QML wallet and AMM client libraries with relative -macOS loader paths, so a normal `nix run .` does not need `DYLD_LIBRARY_PATH`. +The AMM UI supports Apple Silicon through the Nix flake. Intel Macs are not +supported because the pinned Nixpkgs release no longer supports +`x86_64-darwin`. The project packages its QML wallet and AMM client libraries +with relative macOS loader paths, so a normal `nix run .` does not need +`DYLD_LIBRARY_PATH`. ## One-time prerequisites diff --git a/apps/amm/README.md b/apps/amm/README.md index 16033ca..3a7473f 100644 --- a/apps/amm/README.md +++ b/apps/amm/README.md @@ -50,8 +50,8 @@ nix profile install 'github:logos-co/logos-package-manager#cli' This makes `lgpm` available as a global command. -For macOS prerequisites, the Metal toolchain requirement, and common Nix -recovery steps, see [macOS setup](MACOS.md). +For Apple Silicon prerequisites, the Metal toolchain requirement, and common +Nix recovery steps, see [macOS setup](MACOS.md). ## Running the UI standalone diff --git a/apps/amm/flake.lock b/apps/amm/flake.lock index c2eef62..8b81694 100644 --- a/apps/amm/flake.lock +++ b/apps/amm/flake.lock @@ -26906,15 +26906,14 @@ "shared_wallet": { "flake": false, "locked": { - "lastModified": 1, - "narHash": "sha256-m7PiWaU5Beio+XeJP6Tz7JFUq8PZZJvcZrmKwShekTY=", "path": "../shared/wallet", "type": "path" }, "original": { "path": "../shared/wallet", "type": "path" - } + }, + "parent": [] } }, "root": "root", diff --git a/apps/amm/flake.nix b/apps/amm/flake.nix index 356f3ff..36c3eb9 100644 --- a/apps/amm/flake.nix +++ b/apps/amm/flake.nix @@ -40,14 +40,16 @@ test -f ${./qml}/Logos/Wallet/qmldir walletQmlDir="shared-wallet/qml/Logos/Wallet" - if [ ! -d "$walletQmlDir" ]; then + if [ -d "$walletQmlDir" ]; then + walletQmlInstallDir="$out/lib/Logos/Wallet" + mkdir -p "$walletQmlInstallDir" + cp -r "$walletQmlDir/." "$walletQmlInstallDir/" + test -f "$walletQmlInstallDir/qmldir" + elif [ -f "$out/lib/amm_ui_plugin.dylib" ] \ + || [ -f "$out/lib/amm_ui_plugin.so" ]; then echo "Built Logos.Wallet QML module not found" exit 1 fi - walletQmlInstallDir="$out/lib/Logos/Wallet" - mkdir -p "$walletQmlInstallDir" - cp -r "$walletQmlDir/." "$walletQmlInstallDir/" - test -f "$walletQmlInstallDir/qmldir" # The standalone plugin directory only copies directories below lib/. # Ship the Rust client in one of those directories and teach the