diff --git a/AGENTS.md b/AGENTS.md index d3bc859c..209011a9 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -121,5 +121,5 @@ of it. Full standard: `../craftrules/standards/never-crash.md` → `ui-egui`, `mcp` (L5) → apps `lightcraft` (desktop), `lightcraft-cli` (render/commands/MCP). `scenes` generates demo photos. `xtask` = tooling (`ci`, `layers`, `assets`, `parity`, `wasm`, `corpus`, `stats`). `flake.nix` + `nix/package.nix` = the Nix package (`nix build` builds both binaries with the craft-fonts input, installs the -desktop file/icons/AppStream metadata and runs `cargo test --workspace`; `nix develop` = dev shell). Keep it building -when the workspace layout, `Cargo.lock`, the packaging files or the fonts change; see README → Quick start. +desktop file/icons/AppStream metadata and runs `cargo test --workspace`; `nix develop` = dev shell). Community-maintained and not +in CI: it may lag behind the workspace; see README → Quick start. diff --git a/CLAUDE.md b/CLAUDE.md index d3bc859c..209011a9 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -121,5 +121,5 @@ of it. Full standard: `../craftrules/standards/never-crash.md` → `ui-egui`, `mcp` (L5) → apps `lightcraft` (desktop), `lightcraft-cli` (render/commands/MCP). `scenes` generates demo photos. `xtask` = tooling (`ci`, `layers`, `assets`, `parity`, `wasm`, `corpus`, `stats`). `flake.nix` + `nix/package.nix` = the Nix package (`nix build` builds both binaries with the craft-fonts input, installs the -desktop file/icons/AppStream metadata and runs `cargo test --workspace`; `nix develop` = dev shell). Keep it building -when the workspace layout, `Cargo.lock`, the packaging files or the fonts change; see README → Quick start. +desktop file/icons/AppStream metadata and runs `cargo test --workspace`; `nix develop` = dev shell). Community-maintained and not +in CI: it may lag behind the workspace; see README → Quick start. diff --git a/flake.nix b/flake.nix index 918053ac..6869abf4 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ # release channel can retarget it: `inputs.lightcraft.inputs.nixpkgs.follows = "nixpkgs";` nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - # Optional build input of the repository: the Japanese fonts (BIZ UDPGothic, BIZ UDMincho, + # Optional build input of the repository: the CJK fonts (BIZ UDPGothic, BIZ UDMincho, Noto Sans CJK SC, # Shippori Mincho) that `crates/engine/build.rs` embeds when `CRAFT_FONTS_DIR` is set. Official # releases always build with them; without them everything works but Japanese text has no # glyphs. Pinned to the revision the release workflow uses — bump deliberately @@ -91,7 +91,7 @@ RUST_BACKTRACE = "1"; } // lib.optionalAttrs (craft-fonts != null) { - # Japanese glyphs in `cargo run` too; build.rs reads this as CRAFT_FONTS_DIR. + # CJK glyphs in `cargo run` too; build.rs reads this as CRAFT_FONTS_DIR. CRAFT_FONTS_DIR = toString craft-fonts; } ); diff --git a/nix/package.nix b/nix/package.nix index 20b895c7..b364b5c4 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -6,8 +6,8 @@ # Kept in step with the release workflow (.github/workflows/release.yml) and packaging/env.sh: # * `Cargo.lock` drives the dependencies (`cargoLock`), so there is no vendorHash to bump — only # crates.io, no git sources; -# * `CRAFT_FONTS_DIR` embeds the Japanese fonts from storytold/craft-fonts (the `craft-fonts` -# flake input); without it everything builds and runs, but Japanese text has no glyphs; +# * `CRAFT_FONTS_DIR` embeds the CJK fonts from storytold/craft-fonts (the `craft-fonts` +# flake input); without it everything builds and runs, but Japanese and Chinese text have no glyphs; # * the desktop file, hicolor icons and AppStream metadata are the same files the .deb/.rpm ship # (packaging/linux/), so `apt` and NixOS users see one identical LightCraft; # * `doCheck` runs `cargo test --workspace`, what `cargo xtask ci` runs. `nix build` runs it too; @@ -38,7 +38,7 @@ # Adds the driver search path (/run/opengl-driver/lib) to the binaries' RPATH so wgpu finds the # installed Vulkan driver on NixOS. Optional: harmless on nixpkgs without it. autoAddDriverRunpath ? null, - # storytold/craft-fonts checkout (flake input). `null` builds without Japanese glyphs. + # storytold/craft-fonts checkout (flake input). `null` builds without CJK glyphs. craft-fonts ? null, # Release date for the AppStream metadata (YYYY-MM-DD); the flake derives it from its own commit. buildDate ? "1970-01-01",