uninstaller: fix restoring nix-daemon launchd daemon

LnL7 · Nov 11, 2024 · 997f799 · 997f799
1 parent 29f6a5f
commit 997f799
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/pkgs/darwin-uninstaller/configuration.nix b/pkgs/darwin-uninstaller/configuration.nix
@@ -12,6 +12,12 @@ with lib;
   launchd.daemons = mkForce {};
   launchd.user.agents = mkForce {};
 
+  # Don't remove `/Library/LaunchDaemons/org.nixos.nix-daemon.plist`
+  services.nix-daemon.enable = mkForce false;
+
+  # Don't try to reload `nix-daemon`
+  nix.useDaemon = mkForce false;
+
   system.activationScripts.postUserActivation.text = mkAfter ''
     if [[ -L ~/.nix-defexpr/channels/darwin ]]; then
         nix-channel --remove darwin || true

diff --git a/pkgs/darwin-uninstaller/default.nix b/pkgs/darwin-uninstaller/default.nix
@@ -31,7 +31,9 @@ in writeShellApplication {
     echo >&2 "    - remove /Applications/Nix Apps symlink"
     echo >&2 "    - cleanup static /etc files"
     echo >&2 "    - disable and remove all launchd services managed by nix-darwin"
-    echo >&2 "    - restore daemon service from nix installer (only when this is a multi-user install)"
+    if [[ -O /nix/store ]]; then
+      echo >&2 "    - restore nix-daemon service from nix installer as this is a multi-user install"
+    fi
     echo >&2
 
     if [[ -t 0 ]]; then