From 7d50a975d997a718ea9dcdbcf24746a53eb62f30 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <palo@pepe>
Date: Wed, 19 Sep 2018 06:09:17 +0200
Subject: populate pass: do not depend on $PATH

---
 pkgs/populate/default.nix | 9 +++++++--
 1 file 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
 
-- 
cgit v1.2.3