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.
This commit is contained in:
parent
5bf85816d3
commit
a426bfd1bd
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, pass, fetchFromGitHub, oathToolkit }:
|
{ stdenv, fetchFromGitHub, oathToolkit }:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "pass-otp-${version}";
|
name = "pass-otp-${version}";
|
||||||
version = "1.1.0";
|
version = "1.1.0";
|
||||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "1cgj4zc8fq88n3h6c0vkv9i5al785mdprpgpbv5m22dz9p1wqvbb";
|
sha256 = "1cgj4zc8fq88n3h6c0vkv9i5al785mdprpgpbv5m22dz9p1wqvbb";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ pass oathToolkit ];
|
buildInputs = [ oathToolkit ];
|
||||||
|
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
sed -i -e 's|OATH=\$(which oathtool)|OATH=${oathToolkit}/bin/oathtool|' otp.bash
|
sed -i -e 's|OATH=\$(which oathtool)|OATH=${oathToolkit}/bin/oathtool|' otp.bash
|
||||||
|
@ -2,6 +2,8 @@
|
|||||||
, coreutils, gnused, getopt, git, tree, gnupg, which, procps, qrencode
|
, coreutils, gnused, getopt, git, tree, gnupg, which, procps, qrencode
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
|
|
||||||
|
, pass-otp
|
||||||
|
|
||||||
, xclip ? null, xdotool ? null, dmenu ? null
|
, xclip ? null, xdotool ? null, dmenu ? null
|
||||||
, x11Support ? !stdenv.isDarwin
|
, x11Support ? !stdenv.isDarwin
|
||||||
, tombPluginSupport ? false, tomb
|
, tombPluginSupport ? false, tomb
|
||||||
@ -34,7 +36,7 @@ let
|
|||||||
|
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
version = "1.7.1";
|
version = "1.7.1";
|
||||||
name = "password-store-${version}";
|
name = "pass-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz";
|
url = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz";
|
||||||
@ -56,6 +58,14 @@ in stdenv.mkDerivation rec {
|
|||||||
popd
|
popd
|
||||||
'') plugins)}
|
'') 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
|
# Install Emacs Mode. NOTE: We can't install the necessary
|
||||||
# dependencies (s.el and f.el) here. The user has to do this
|
# dependencies (s.el and f.el) here. The user has to do this
|
||||||
# himself.
|
# himself.
|
||||||
|
Loading…
Reference in New Issue
Block a user