Merge pull request #1279 from emilazy/push-tstmztlwwouo

darwin-uninstaller: remove `darwin` channel from `root` too
LnL7 · Jan 21, 2025 · 46d0fa4 · 46d0fa4
2 parents 3cdacf1 + 94adbd6
commit 46d0fa4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkgs/darwin-uninstaller/configuration.nix b/pkgs/darwin-uninstaller/configuration.nix
@@ -16,12 +16,12 @@ with lib;
   nix.useDaemon = mkForce false;
 
   system.activationScripts.postUserActivation.text = mkAfter ''
-    if [[ -L ~/.nix-defexpr/channels/darwin ]]; then
-        nix-channel --remove darwin || true
-    fi
+    nix-channel --remove darwin || true
   '';
 
   system.activationScripts.postActivation.text = mkAfter ''
+    nix-channel --remove darwin || true
+
     if [[ -L /Applications/Nix\ Apps ]]; then
         rm /Applications/Nix\ Apps
     fi

diff --git a/pkgs/darwin-uninstaller/default.nix b/pkgs/darwin-uninstaller/default.nix
@@ -77,7 +77,7 @@ in writeShellApplication {
       echo >&2
 
       echo >&2 "checking darwin channel"
-      test -e ~/.nix-defexpr/channels/darwin && exit 1
+      nix-instantiate --find-file darwin && exit 1
       echo >&2 "checking /etc"
       test -e /etc/static && exit 1
       echo >&2 "checking /run/current-system"