diff options
| author | MERCIER Michael <michael.mercier@inria.fr> | 2017-12-06 14:49:35 +0100 |
|---|---|---|
| committer | MERCIER Michael <michael.mercier@inria.fr> | 2017-12-06 14:49:35 +0100 |
| commit | f4d1d269faa634482ee13f75b66a16a00aa0a8d6 (patch) | |
| tree | b88549ea13c66866d79cedb451d31cb896a15bff /pkgs/tools | |
| parent | 3963dfe22208b997c5235e2fddf5808f002b7637 (diff) | |
| download | nixlib-f4d1d269faa634482ee13f75b66a16a00aa0a8d6.tar nixlib-f4d1d269faa634482ee13f75b66a16a00aa0a8d6.tar.gz nixlib-f4d1d269faa634482ee13f75b66a16a00aa0a8d6.tar.bz2 nixlib-f4d1d269faa634482ee13f75b66a16a00aa0a8d6.tar.lz nixlib-f4d1d269faa634482ee13f75b66a16a00aa0a8d6.tar.xz nixlib-f4d1d269faa634482ee13f75b66a16a00aa0a8d6.tar.zst nixlib-f4d1d269faa634482ee13f75b66a16a00aa0a8d6.zip | |
pass: Make tomb plugin optional (disabled by default)
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/security/pass/default.nix | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index b338f4f0cb8f..ad2afa8ed912 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -4,7 +4,7 @@ , xclip ? null, xdotool ? null, dmenu ? null , x11Support ? !stdenv.isDarwin -, tomb +, tombPluginSupport ? false, tomb }: with lib; @@ -18,14 +18,19 @@ let owner = "roddhjav"; repo = "pass-${p.name}"; inherit (p) rev sha256; - })) [ + })) + ([ { name = "import"; - rev = "491935bd275f29ceac2b876b3a288011d1ce31e7"; sha256 = "02mbh05ab8h7kc30hz718d1d1vkjz43b96c7p0xnd92610d2q66q"; } + rev = "491935bd275f29ceac2b876b3a288011d1ce31e7"; + sha256 = "02mbh05ab8h7kc30hz718d1d1vkjz43b96c7p0xnd92610d2q66q"; } { name = "update"; - rev = "cf576c9036fd18efb9ed29e0e9f811207b556fde"; sha256 = "1hhbrg6a2walrvla6q4cd3pgrqbcrf9brzjkb748735shxfn52hd"; } - { name = "tomb"; - rev = "3368134898a42c1b758fabac625ec240e125c6be"; sha256 = "0qqmxfg4w3r088qhlkhs44036mya82vjflsjjhw2hk8y0wd2i6ds"; } - ]; + rev = "cf576c9036fd18efb9ed29e0e9f811207b556fde"; + sha256 = "1hhbrg6a2walrvla6q4cd3pgrqbcrf9brzjkb748735shxfn52hd"; } + ] ++ stdenv.lib.optional tombPluginSupport { + name = "tomb"; + rev = "3368134898a42c1b758fabac625ec240e125c6be"; + sha256 = "0qqmxfg4w3r088qhlkhs44036mya82vjflsjjhw2hk8y0wd2i6ds"; } + ); in stdenv.mkDerivation rec { version = "1.7.1"; @@ -69,8 +74,8 @@ in stdenv.mkDerivation rec { tree which qrencode - tomb - ] ++ stdenv.lib.optional stdenv.isLinux procps + ] ++ optional tombPluginSupport tomb + ++ optional stdenv.isLinux procps ++ ifEnable x11Support [ dmenu xclip xdotool ]); postFixup = '' |