From 0f998056fabe314fb4bde296c0970805e086307e Mon Sep 17 00:00:00 2001
From: Jade Lovelace <lix@jade.fyi>
Date: Wed, 31 Jul 2024 20:59:33 -0700
Subject: [PATCH] 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
---
 doc/manual/src/language/advanced-attributes.md |  1 -
 src/nix/meson.build                            | 17 +++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/doc/manual/src/language/advanced-attributes.md b/doc/manual/src/language/advanced-attributes.md
index ec21b9990..e9006a3ae 100644
--- a/doc/manual/src/language/advanced-attributes.md
+++ b/doc/manual/src/language/advanced-attributes.md
@@ -326,7 +326,6 @@ Derivations can declare some infrequently used optional attributes.
     ```
 
   - [`unsafeDiscardReferences`]{#adv-attr-unsafeDiscardReferences}\
-
     When using [structured attributes](#adv-attr-structuredAttrs), the
     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.
diff --git a/src/nix/meson.build b/src/nix/meson.build
index 97387e402..80223a390 100644
--- a/src/nix/meson.build
+++ b/src/nix/meson.build
@@ -1,8 +1,8 @@
-generate_manpage_gen = 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')
-
-get_env_gen = gen_header.process('get-env.sh')
+nix_generated_headers = [
+  gen_header.process(meson.project_source_root() / 'doc/manual/generate-manpage.nix'),
+  gen_header.process(meson.project_source_root() / 'doc/manual/utils.nix'),
+  gen_header.process('get-env.sh'),
+]
 
 # 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.
@@ -18,7 +18,7 @@ run_command(
   meson.current_build_dir() / 'doc/files/profiles.md',
   check : true,
 )
-profiles_md_gen = gen_header.process(
+nix_generated_headers += gen_header.process(
   meson.current_build_dir() / 'doc/files/profiles.md',
   preserve_path_from : meson.current_build_dir(),
 )
@@ -74,10 +74,7 @@ nix_sources = files(
 nix = executable(
   'nix',
   nix_sources,
-  generate_manpage_gen,
-  utils_gen,
-  get_env_gen,
-  profiles_md_gen,
+  nix_generated_headers,
   nix2_commands_sources,
   dependencies : [
     libasanoptions,