aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngolf Wagner <palo@pepe>2018-09-19 06:09:17 +0200
committertv <tv@krebsco.de>2018-09-19 07:37:05 +0200
commit7d50a975d997a718ea9dcdbcf24746a53eb62f30 (patch)
tree6b2315319848b998024493dbd9a8437eb16be8fa
parent5ae2b7f3691364ba17cdb01fde98c2722d3a707e (diff)
populate pass: do not depend on $PATHni/fixing-passfixing-pass
-rw-r--r--pkgs/populate/default.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/populate/default.nix b/pkgs/populate/default.nix
index 69f4ab3..7b2d8a8 100644
--- a/pkgs/populate/default.nix
+++ b/pkgs/populate/default.nix
@@ -1,7 +1,12 @@
with import ../../lib;
with shell;
-{ coreutils, dash, findutils, git, jq, openssh, rsync, writeDash }:
+{ coreutils, dash, findutils, git, jq, openssh, pass, rsync, writeDash }:
+
+let
+ # Alias to allow pop.pass's argument to be "pass".
+ passwordstore = pass;
+in
let
check = { force, target }: let
@@ -72,7 +77,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