aiolabs/webapp
8
0
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request 'feat(nix): lib.mkWebapp accepts extraEnv attr' (#100) from feat/lib-mkwebapp-extraenv into dev

Browse source 
Reviewed-on: #100
This commit is contained in:
padreug 2026-06-10 15:05:12 +00:00
commit de03fac69f
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
flake.nix
View file

@ -19,7 +19,7 @@
inherit (pkgs.stdenv.hostPlatform) system; inherit (pkgs.stdenv.hostPlatform) system;
}; };
mkWebapp = { pkgs, brandDir ? ./branding/default, app ? "main" }: mkWebapp = { pkgs, brandDir ? ./branding/default, app ? "main", extraEnv ? {} }:
let let
buildScript = if app == "main" then "build" else "build:${app}"; buildScript = if app == "main" then "build" else "build:${app}";
outDir = if app == "main" then "dist" else "dist-${app}"; outDir = if app == "main" then "dist" else "dist-${app}";
@ -59,13 +59,19 @@
# pwa-assets.config.ts. brandDir is either ./branding/default # pwa-assets.config.ts. brandDir is either ./branding/default
# (a path inside this flake's source) or an external path that # (a path inside this flake's source) or an external path that
# nix has copied into the build sandbox. # nix has copied into the build sandbox.
#
# `extraEnv` flows in VITE_* and any other build-time env vars
# the caller wants to bake into the bundle (e.g. webapp-module
# passes VITE_NOSTR_RELAYS / VITE_LNBITS_BASE_URL / …; the
# server-deploy standalones module passes VITE_BASE_PATH +
# VITE_APP_NAME for per-app path mounts).
env = { env = {
BRAND_DIR = "${brandDir}"; BRAND_DIR = "${brandDir}";
BRAND_APP = if app == "main" then "" else app; BRAND_APP = if app == "main" then "" else app;
# Avoid pnpm 10's interactive modules-purge prompt in the # Avoid pnpm 10's interactive modules-purge prompt in the
# sandbox (ERR_PNPM_ABORTED_REMOVE_MODULES_DIR_NO_TTY). # sandbox (ERR_PNPM_ABORTED_REMOVE_MODULES_DIR_NO_TTY).
CI = "true"; CI = "true";
}; } // extraEnv;
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild