Merge pull request #806 from DeterminateSystems/easier-uninstall

Install darwin-uninstall by default, which includes the 'empty' config it switches to

2 files changed, 13 insertions, 17 deletions

diff --git a/pkgs/darwin-uninstaller/configuration.nix b/pkgs/darwin-uninstaller/configuration.nix
index 96a2165..6487774 100644
--- a/pkgs/darwin-uninstaller/configuration.nix
+++ b/pkgs/darwin-uninstaller/configuration.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/pkgs/darwin-uninstaller/default.nix b/pkgs/darwin-uninstaller/default.nix
index ca7be48..94c0749 100644
--- a/pkgs/darwin-uninstaller/default.nix
+++ b/pkgs/darwin-uninstaller/default.nix
@@ -1,18 +1,17 @@
-{ stdenv, nix, pkgs, nix-darwin }:
+{ stdenv, lib, pkgs }:
 
 let
-  configuration = builtins.path {
-    name = "nix-darwin-uninstaller-configuration";
-    path = ./.;
-    filter = name: _type: name != toString ./default.nix;
+  uninstallSystem = import ../../eval-config.nix {
+    inherit lib;
+    modules = [
+      ./configuration.nix
+      {
+        nixpkgs.source = pkgs.path;
+        nixpkgs.hostPlatform = pkgs.system;
+        system.includeUninstaller = false;
+      }
+    ];
   };
-
-  nixPath = pkgs.lib.concatStringsSep ":" [
-    "darwin-config=${configuration}/configuration.nix"
-    "darwin=${nix-darwin}"
-    "nixpkgs=${pkgs.path}"
-    "$NIX_PATH"
-  ];
 in
 
 stdenv.mkDerivation {
@@ -62,10 +61,7 @@ stdenv.mkDerivation {
         esac
     fi
 
-    export nix=${nix}
-    export NIX_PATH=${nixPath}
-    system=$($nix/bin/nix-build '<darwin>' -A system)
-    $system/sw/bin/darwin-rebuild switch
+    ${uninstallSystem.system}/sw/bin/darwin-rebuild activate
 
     if test -L /run/current-system; then
       sudo rm /run/current-system