misc docs/meson tidying

The docs page has an incorrect escape that leads to a backslash
appearing in output. Meson stuff is self-explanatory, just shortens and
simplifies a bit.

Change-Id: Ib63adf934efd3caeb82ca82988f230e8858a79f9
This commit is contained in:
jade 2024-07-31 20:59:33 -07:00
parent 3daeeaefb1
commit 0f998056fa
2 changed files with 7 additions and 11 deletions

View file

@ -326,7 +326,6 @@ Derivations can declare some infrequently used optional attributes.
``` ```
- [`unsafeDiscardReferences`]{#adv-attr-unsafeDiscardReferences}\ - [`unsafeDiscardReferences`]{#adv-attr-unsafeDiscardReferences}\
When using [structured attributes](#adv-attr-structuredAttrs), the When using [structured attributes](#adv-attr-structuredAttrs), the
attribute `unsafeDiscardReferences` is an attribute set with a boolean value for each output name. attribute `unsafeDiscardReferences` is an attribute set with a boolean value for each output name.
If set to `true`, it disables scanning the output for runtime dependencies. If set to `true`, it disables scanning the output for runtime dependencies.

View file

@ -1,8 +1,8 @@
generate_manpage_gen = gen_header.process(meson.project_source_root() / 'doc/manual/generate-manpage.nix') nix_generated_headers = [
gen_header.process(meson.project_source_root() / 'doc/manual/generate-manpage.nix'),
utils_gen = gen_header.process(meson.project_source_root() / 'doc/manual/utils.nix') gen_header.process(meson.project_source_root() / 'doc/manual/utils.nix'),
gen_header.process('get-env.sh'),
get_env_gen = gen_header.process('get-env.sh') ]
# src/nix/profile.cc includes src/nix/profile.md, which includes "doc/files/profiles.md.gen.hh". # src/nix/profile.cc includes src/nix/profile.md, which includes "doc/files/profiles.md.gen.hh".
# Unfortunately, https://github.com/mesonbuild/meson/issues/2320. # Unfortunately, https://github.com/mesonbuild/meson/issues/2320.
@ -18,7 +18,7 @@ run_command(
meson.current_build_dir() / 'doc/files/profiles.md', meson.current_build_dir() / 'doc/files/profiles.md',
check : true, check : true,
) )
profiles_md_gen = gen_header.process( nix_generated_headers += gen_header.process(
meson.current_build_dir() / 'doc/files/profiles.md', meson.current_build_dir() / 'doc/files/profiles.md',
preserve_path_from : meson.current_build_dir(), preserve_path_from : meson.current_build_dir(),
) )
@ -74,10 +74,7 @@ nix_sources = files(
nix = executable( nix = executable(
'nix', 'nix',
nix_sources, nix_sources,
generate_manpage_gen, nix_generated_headers,
utils_gen,
get_env_gen,
profiles_md_gen,
nix2_commands_sources, nix2_commands_sources,
dependencies : [ dependencies : [
libasanoptions, libasanoptions,