cli: stop using system dependencies in destroy step

re-applying 15aa78e because I accidentally overwrote it in 15aa78e.
nix-community · Oct 18, 2024 · a6a3179 · a6a3179
1 parent d7d57ed
commit a6a3179
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/lib/default.nix b/lib/default.nix
@@ -391,21 +391,22 @@ let
             default = { pkgs, checked ? false }:
               let
                 throwIfNoDisksDetected = _: v: if devices.disk == { } then throw "No disks defined, did you forget to import your disko config?" else v;
+                destroyDependencies = with pkgs; [
+                  util-linux
+                  e2fsprogs
+                  mdadm
+                  zfs
+                  lvm2
+                  bash
+                  jq
+                  gnused
+                  gawk
+                  coreutils-full
+                ];
               in
               lib.mapAttrs throwIfNoDisksDetected {
                 destroyScript = (diskoLib.writeCheckedBash { inherit pkgs checked; }) "disko-destroy" ''
-                  export PATH=${lib.makeBinPath (with pkgs; [
-                    util-linux
-                    e2fsprogs
-                    mdadm
-                    zfs
-                    lvm2
-                    bash
-                    jq
-                    gnused
-                    gawk
-                    coreutils-full
-                  ])}:$PATH
+                  export PATH=${lib.makeBinPath destroyDependencies}:$PATH
                   ${cfg.config._destroy}
                 '';
 
@@ -420,7 +421,7 @@ let
                 '';
 
                 diskoScript = (diskoLib.writeCheckedBash { inherit pkgs checked; }) "disko" ''
-                  export PATH=${lib.makeBinPath ((cfg.config._packages pkgs) ++ [ pkgs.bash ])}:$PATH
+                  export PATH=${lib.makeBinPath ((cfg.config._packages pkgs) ++ [ pkgs.bash ] ++ destroyDependencies)}:$PATH
                   ${cfg.config._disko}
                 '';