From 192f9cc4162ab1cacbd12664cd968c5d358c1f7e Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 10 Dec 2022 01:03:17 +0100 Subject: scripts: append old $PATH for destroying --- default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'default.nix') diff --git a/default.nix b/default.nix index bc975a7..ada33e4 100644 --- a/default.nix +++ b/default.nix @@ -17,7 +17,7 @@ in { create = cfg: types.diskoLib.create (eval cfg).config.devices; createScript = cfg: pkgs: pkgs.writeScript "disko-create" '' #!/usr/bin/env bash - export PATH=${lib.makeBinPath (types.diskoLib.packages (eval cfg).config.devices pkgs)} + export PATH=${lib.makeBinPath (types.diskoLib.packages (eval cfg).config.devices pkgs)}:$PATH ${types.diskoLib.create (eval cfg).config.devices} ''; createScriptNoDeps = cfg: pkgs: pkgs.writeScript "disko-create" '' @@ -27,7 +27,7 @@ in { mount = cfg: types.diskoLib.mount (eval cfg).config.devices; mountScript = cfg: pkgs: pkgs.writeScript "disko-mount" '' #!/usr/bin/env bash - export PATH=${lib.makeBinPath (types.diskoLib.packages (eval cfg).config.devices pkgs)} + export PATH=${lib.makeBinPath (types.diskoLib.packages (eval cfg).config.devices pkgs)}:$PATH ${types.diskoLib.mount (eval cfg).config.devices} ''; mountScriptNoDeps = cfg: pkgs: pkgs.writeScript "disko-mount" '' @@ -37,7 +37,7 @@ in { zapCreateMount = cfg: types.diskoLib.zapCreateMount (eval cfg).config.devices; zapCreateMountScript = cfg: pkgs: pkgs.writeScript "disko-zap-create-mount" '' #!/usr/bin/env bash - export PATH=${lib.makeBinPath (types.diskoLib.packages (eval cfg).config.devices pkgs)} + export PATH=${lib.makeBinPath (types.diskoLib.packages (eval cfg).config.devices pkgs)}:$PATH ${types.diskoLib.zapCreateMount (eval cfg).config.devices} ''; zapCreateMountScriptNoDeps = cfg: pkgs: pkgs.writeScript "disko-zap-create-mount" '' -- cgit v1.2.3