Merge pull request 'feat(nix): lib.mkWebapp accepts extraEnv attr' (#100) from feat/lib-mkwebapp-extraenv into dev
Reviewed-on: #100
This commit is contained in:
commit
de03fac69f
1 changed files with 8 additions and 2 deletions
10
flake.nix
10
flake.nix
|
|
@ -19,7 +19,7 @@
|
|||
inherit (pkgs.stdenv.hostPlatform) system;
|
||||
};
|
||||
|
||||
mkWebapp = { pkgs, brandDir ? ./branding/default, app ? "main" }:
|
||||
mkWebapp = { pkgs, brandDir ? ./branding/default, app ? "main", extraEnv ? {} }:
|
||||
let
|
||||
buildScript = if app == "main" then "build" else "build:${app}";
|
||||
outDir = if app == "main" then "dist" else "dist-${app}";
|
||||
|
|
@ -59,13 +59,19 @@
|
|||
# pwa-assets.config.ts. brandDir is either ./branding/default
|
||||
# (a path inside this flake's source) or an external path that
|
||||
# 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 = {
|
||||
BRAND_DIR = "${brandDir}";
|
||||
BRAND_APP = if app == "main" then "" else app;
|
||||
# Avoid pnpm 10's interactive modules-purge prompt in the
|
||||
# sandbox (ERR_PNPM_ABORTED_REMOVE_MODULES_DIR_NO_TTY).
|
||||
CI = "true";
|
||||
};
|
||||
} // extraEnv;
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue