From d67e24afec185eee740180b5f023fc4df462013c Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 2 Dec 2024 17:42:11 +0100
Subject: [PATCH 1/3] fix: Add missing manpages to meson.build

---
 doc/manual/meson.build | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/manual/meson.build b/doc/manual/meson.build
index 3630e2dc8..c4cc9b893 100644
--- a/doc/manual/meson.build
+++ b/doc/manual/meson.build
@@ -199,6 +199,7 @@ nix3_manpages = [
   'nix3-build',
   'nix3-bundle',
   'nix3-config',
+  'nix3-config-check',
   'nix3-config-show',
   'nix3-copy',
   'nix3-daemon',
@@ -206,8 +207,8 @@ nix3_manpages = [
   'nix3-derivation',
   'nix3-derivation-show',
   'nix3-develop',
-  #'nix3-doctor',
   'nix3-edit',
+  'nix3-env-shell',
   'nix3-eval',
   'nix3-flake-archive',
   'nix3-flake-check',
@@ -224,6 +225,7 @@ nix3_manpages = [
   'nix3-fmt',
   'nix3-hash-file',
   'nix3-hash',
+  'nix3-hash-convert',
   'nix3-hash-path',
   'nix3-hash-to-base16',
   'nix3-hash-to-base32',
@@ -238,6 +240,7 @@ nix3_manpages = [
   'nix3-nar-cat',
   'nix3-nar-dump-path',
   'nix3-nar-ls',
+  'nix3-nar-pack',
   'nix3-nar',
   'nix3-path-info',
   'nix3-print-dev-env',
@@ -260,7 +263,7 @@ nix3_manpages = [
   'nix3-repl',
   'nix3-run',
   'nix3-search',
-  #'nix3-shell',
+  'nix3-store-add',
   'nix3-store-add-file',
   'nix3-store-add-path',
   'nix3-store-cat',
@@ -270,6 +273,7 @@ nix3_manpages = [
   'nix3-store-diff-closures',
   'nix3-store-dump-path',
   'nix3-store-gc',
+  'nix3-store-info',
   'nix3-store-ls',
   'nix3-store-make-content-addressed',
   'nix3-store',

From 038ab46d7a08b34e9706a5f7a3c75995cd145899 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 3 Dec 2024 16:37:07 +0100
Subject: [PATCH 2/3] Restore org.nixos.nix-daemon.plist installation

---
 misc/launchd/meson.build | 13 +++++++++++++
 misc/meson.build         |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 misc/launchd/meson.build

diff --git a/misc/launchd/meson.build b/misc/launchd/meson.build
new file mode 100644
index 000000000..5168131d1
--- /dev/null
+++ b/misc/launchd/meson.build
@@ -0,0 +1,13 @@
+configure_file(
+  input : 'org.nixos.nix-daemon.plist.in',
+  output : 'org.nixos.nix-daemon.plist',
+  install : true,
+  install_dir : get_option('prefix') / 'Library/LaunchDaemons',
+  install_mode : 'rw-r--r--',
+  configuration : {
+    # TODO: unhardcode paths with something like:
+    # 'storedir' : store_dir,
+    # 'localstatedir' : localstatedir,
+    # 'bindir' : bindir,
+  },
+)
diff --git a/misc/meson.build b/misc/meson.build
index a6d1f944b..78ae3c06c 100644
--- a/misc/meson.build
+++ b/misc/meson.build
@@ -2,4 +2,5 @@ subdir('bash')
 subdir('fish')
 subdir('zsh')
 
+subdir('launchd')
 subdir('systemd')

From 63c0f0dcd258b6763970a80c43bed431e691e5ba Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 3 Dec 2024 16:51:01 +0100
Subject: [PATCH 3/3] Install init system configs only when relevant

---
 misc/meson.build | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/misc/meson.build b/misc/meson.build
index 78ae3c06c..82f2b0c65 100644
--- a/misc/meson.build
+++ b/misc/meson.build
@@ -2,5 +2,10 @@ subdir('bash')
 subdir('fish')
 subdir('zsh')
 
-subdir('launchd')
-subdir('systemd')
+if host_machine.system() == 'linux'
+  subdir('systemd')
+endif
+
+if host_machine.system() == 'darwin'
+  subdir('launchd')
+endif