diff options
| author | Ingolf Wagner <palo@pepe> | 2018-09-19 06:09:17 +0200 |
|---|---|---|
| committer | Ingolf Wagner <palo@pepe> | 2018-09-19 06:09:17 +0200 |
| commit | 1194534c63de0e98fd5ff8184f2d8a856aa30bf9 (patch) | |
| tree | 4a363f6947b688839a0128b595887e7c45732396 | |
| parent | 5ae2b7f3691364ba17cdb01fde98c2722d3a707e (diff) | |
pass: does not depend on proper $PATH variable.palo/fixing-pass
| -rw-r--r-- | pkgs/overlay.nix | 2 | ||||
| -rw-r--r-- | pkgs/populate/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index 24ecf17..a4999ed 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -4,5 +4,5 @@ in self: super: { krops = self.callPackage ./krops {}; - populate = self.callPackage ./populate {}; + populate = self.callPackage ./populate { passwordstore = super.pass; }; } diff --git a/pkgs/populate/default.nix b/pkgs/populate/default.nix index 69f4ab3..826b4be 100644 --- a/pkgs/populate/default.nix +++ b/pkgs/populate/default.nix @@ -1,7 +1,7 @@ with import ../../lib; with shell; -{ coreutils, dash, findutils, git, jq, openssh, rsync, writeDash }: +{ passwordstore, coreutils, dash, findutils, git, jq, openssh, rsync, writeDash }: let check = { force, target }: let @@ -72,7 +72,7 @@ let tmp_path=$tmp_dir/$rel_name ${coreutils}/bin/mkdir -p "$(${coreutils}/bin/dirname "$tmp_path")" - PASSWORD_STORE_DIR=${quote pass.dir} pass show "$pass_name" > "$tmp_path" + PASSWORD_STORE_DIR=${quote pass.dir} ${passwordstore}/bin/pass show "$pass_name" > "$tmp_path" ${coreutils}/bin/touch -d "$pass_date" "$tmp_path" done |