diff options
| author | tv <tv@krebsco.de> | 2018-04-10 13:27:34 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2018-04-10 13:42:55 +0200 |
| commit | a426bfd1bda89cc1af901f6196a323d7be4e4865 (patch) | |
| tree | 78ee0e0ef7a33b68f83b2700225a1a4c505ad09c /tv | |
| parent | 5bf85816d3c8b0e37a6f6a6ff2eaafc059b5199c (diff) | |
tv: make pass and pass-otp work together
pass's name argument has been modified to work with
tv/5pkgs/simple/default.nix's callPackage.
Diffstat (limited to 'tv')
| -rw-r--r-- | tv/5pkgs/simple/pass-otp/default.nix | 4 | ||||
| -rw-r--r-- | tv/5pkgs/simple/pass/default.nix | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/tv/5pkgs/simple/pass-otp/default.nix b/tv/5pkgs/simple/pass-otp/default.nix index 7f0f44bd..33411180 100644 --- a/tv/5pkgs/simple/pass-otp/default.nix +++ b/tv/5pkgs/simple/pass-otp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pass, fetchFromGitHub, oathToolkit }: +{ stdenv, fetchFromGitHub, oathToolkit }: stdenv.mkDerivation rec { name = "pass-otp-${version}"; version = "1.1.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1cgj4zc8fq88n3h6c0vkv9i5al785mdprpgpbv5m22dz9p1wqvbb"; }; - buildInputs = [ pass oathToolkit ]; + buildInputs = [ oathToolkit ]; patchPhase = '' sed -i -e 's|OATH=\$(which oathtool)|OATH=${oathToolkit}/bin/oathtool|' otp.bash diff --git a/tv/5pkgs/simple/pass/default.nix b/tv/5pkgs/simple/pass/default.nix index ad2afa8e..3b692808 100644 --- a/tv/5pkgs/simple/pass/default.nix +++ b/tv/5pkgs/simple/pass/default.nix @@ -2,6 +2,8 @@ , coreutils, gnused, getopt, git, tree, gnupg, which, procps, qrencode , makeWrapper +, pass-otp + , xclip ? null, xdotool ? null, dmenu ? null , x11Support ? !stdenv.isDarwin , tombPluginSupport ? false, tomb @@ -34,7 +36,7 @@ let in stdenv.mkDerivation rec { version = "1.7.1"; - name = "password-store-${version}"; + name = "pass-${version}"; src = fetchurl { url = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz"; @@ -56,6 +58,14 @@ in stdenv.mkDerivation rec { popd '') plugins)} + ln -s \ + ${pass-otp}/lib/password-store/extensions/otp.bash \ + $out/lib/password-store/extensions/ + + ln -s \ + ${pass-otp}/share/man/man1/pass-otp.1.gz \ + $out/share/man/man1/ + # Install Emacs Mode. NOTE: We can't install the necessary # dependencies (s.el and f.el) here. The user has to do this # himself. |